diff --git a/AndroidManifest.xml b/AndroidManifest.xml
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -119,12 +119,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
+            <!-- Does not work on Android N, workaround in registering intent filter
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
             </intent-filter>
+            -->
             <!--
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -70,28 +70,28 @@
     </LinearLayout>
 
     <TextView
-        android:id="@+id/not_reachable_message"
+        android:id="@+id/no_network_message"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:text="@string/unreachable_description"
+        android:text="@string/no_network_message"
         android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
     <TextView
-        android:id="@+id/on_data_message"
+        android:id="@+id/not_reachable_message"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:text="@string/on_data_message"
+        android:text="@string/unreachable_description"
         android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Reanomena</string>
   <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="on_data_message">Sembla que esteu amb una connexió de dades mòbils. El KDE Connect només funciona amb xarxes locals.</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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Přejmenovat</string>
   <string name="refresh">Obnovit</string>
   <string name="unreachable_description">Toto spárované zařízení je nedosažitelné. Ujistěte se, že běží ve stejné síti.</string>
-  <string name="on_data_message">Vypadá to, že jste na mobilním internetovém připojení. KDE Connect funguje pouze na lokální síti.</string>
   <string name="no_file_browser">Není nainstalován žádný prohlížeč souborů.</string>
   <string name="pref_plugin_telepathy">Poslat SMS</string>
   <string name="pref_plugin_telepathy_desc">Posílejte zprávy ze své pracovní plochy</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Omdøb</string>
   <string name="refresh">Genopfrisk</string>
   <string name="unreachable_description">Denne parrede enhed kan ikke nås. Sørg for at den er forbundet til samme netværk som dig.</string>
-  <string name="on_data_message">Det lader til at du er på en mobil dataforbindelse. KDE Connect virker kun på lokale netværk.</string>
   <string name="no_file_browser">Der er ingen filhåndtering installeret.</string>
   <string name="pref_plugin_telepathy">Send SMS</string>
   <string name="pref_plugin_telepathy_desc">Send SMS-beskeder fra din desktop</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -162,7 +162,7 @@
   <string name="device_rename_confirm">Rename</string>
   <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="on_data_message">It looks like you are on a mobile data connection. KDE Connect only works on local networks.</string>
+  <string name="no_network_message">It looks like you aren\'t connected to any compatible networks. Try connecting to WiFi.</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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Renombrar</string>
   <string name="refresh">Actualizar</string>
   <string name="unreachable_description">Este dispositivo vinculado no está disponible. Asegúrese que está conectado a su misma red.</string>
-  <string name="on_data_message">Parece que se encuentra en una conexión de datos móviles. KDE Connect solo funciona en redes locales.</string>
   <string name="no_file_browser">No hay navegadores de archivos instalados.</string>
   <string name="pref_plugin_telepathy">Enviar SMS</string>
   <string name="pref_plugin_telepathy_desc">Enviar mensajes de texto desde su escritorio</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Aldatu izena</string>
   <string name="refresh">Freskatu</string>
   <string name="unreachable_description">Parekatutako gailu hau ez dago eskuragarri. Egiaztatu sare berera konektatuta dagoela.</string>
-  <string name="on_data_message">Badirudi datu mugikorrak erabiliz konektatu zarela. KDE Connect sare lokalen bitartez besterik ez dabil.</string>
   <string name="no_file_browser">Ez dago fitxategi arakatzailerik instalatuta.</string>
   <string name="pref_plugin_telepathy">Bidali SMSa</string>
   <string name="pref_plugin_telepathy_desc">Bidali testu-mezuak zure mahaigainetik</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Renommer</string>
   <string name="refresh">Mettre à jour</string>
   <string name="unreachable_description">Ce périphérique associé n\'est pas joignable. Assurez-vous qu\'il est bien connecté au même réseau.</string>
-  <string name="on_data_message">Il semble que vous utilisiez une connexion de données mobile. KDE Connect fonctionne uniquement sur un réseau local.</string>
   <string name="no_file_browser">Aucun navigateur de fichiers installé.</string>
   <string name="pref_plugin_telepathy">Envoyer un SMS</string>
   <string name="pref_plugin_telepathy_desc">Envoyer des SMS depuis votre bureau</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Cambiar o nome</string>
   <string name="refresh">Actualizar</string>
   <string name="unreachable_description">Este dispositivo emparellado está fóra do alcance. Asegúrese de que está conectado á mesma rede.</string>
-  <string name="on_data_message">Parece que está usando unha conexión de datos de móbil. KDE Connect só funciona en redes locais.</string>
   <string name="no_file_browser">Non hai navegadores de ficheiros instalados.</string>
   <string name="pref_plugin_telepathy">Enviar unha mensaxe de texto</string>
   <string name="pref_plugin_telepathy_desc">Enviar mensaxes de texto desde un computador de escritorio.</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">שנה שם</string>
   <string name="refresh">רענן</string>
   <string name="unreachable_description">ההתקן המתואם לא זמין, וודא שהוא מחובר לאותה רשת אליה אתה מחובר.</string>
-  <string name="on_data_message">נראה שאתה מחובר דרך הרשת הסלולרית. KDE Connect עובד רק עם רשתות מקומיות.</string>
   <string name="no_file_browser">לא נמצאו מנהלי קבצים מותקנים במכשיר זה.</string>
   <string name="pref_plugin_telepathy">שליחת הודעת SMS</string>
   <string name="pref_plugin_telepathy_desc">שלח הודעות מהמחשב שלך</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Rinomina</string>
   <string name="refresh">Aggiorna</string>
   <string name="unreachable_description">Questo dispositivo associato non è raggiungibile. Assicurati che sia connesso alla tua stessa rete.</string>
-  <string name="on_data_message">Sembra che tu stia utilizzando una connessione dati mobile. KDE Connect funziona solo su reti locali.</string>
   <string name="no_file_browser">Non ci sono navigatori di file installati.</string>
   <string name="pref_plugin_telepathy">Invia SMS</string>
   <string name="pref_plugin_telepathy_desc">Invia messaggi di testo dal tuo desktop</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Hernoemen</string>
   <string name="refresh">Verversen</string>
   <string name="unreachable_description">Dit gepaarde apparaat is niet bereikbaar. Ga na dat het is verbonden met uw zelfde netwerk.</string>
-  <string name="on_data_message">Het lijkt of op een mobiele gegevensverbinding zit. KDE Connect werkt alleen op locale netwerken.</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>
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Endra namn</string>
   <string name="refresh">Oppdater</string>
   <string name="unreachable_description">Får ikkje kontakt med den para eininga. Sjå til at ho er kopla til same nettverk.</string>
-  <string name="on_data_message">Det ser ut til at er kopla til eit mobilt samband. KDE Connect verkar berre på lokale nettverk.</string>
   <string name="no_file_browser">Ingen filhandsamarar er installerte.</string>
   <string name="pref_plugin_telepathy">Send SMS</string>
   <string name="pref_plugin_telepathy_desc">Send tekstmeldingar frå datamaskina</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Zmień nazwę</string>
   <string name="refresh">Odśwież</string>
   <string name="unreachable_description">To sparowane urządzenie jest nieosiągalne. Upewnij się, że jest podłączone do tej samej sieci.</string>
-  <string name="on_data_message">Wygląda na to, że korzystasz z internetu mobilnego. KDE Connect działa tylko na lokalnych sieciach.</string>
   <string name="no_file_browser">Nie wgrano żadanych przeglądarek plików.</string>
   <string name="pref_plugin_telepathy">Wyślij SMS-a</string>
   <string name="pref_plugin_telepathy_desc">Wyślij wiadomość tekstową z komputera</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Mudar o Nome</string>
   <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="on_data_message">Parece que está com uma ligação de dados móveis. O KDE Connect só se liga em redes locais.</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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Переименовать</string>
   <string name="refresh">Обновить</string>
   <string name="unreachable_description">Это сопряжённое устройство недоступно. Проверьте, что оно подключено к той же локальной сети.</string>
-  <string name="on_data_message">Похоже, вы подключены к мобильной сети. KDE Connect работает только в локальных сетях.</string>
   <string name="no_file_browser">Не удалось открыть диалог выбора файла.</string>
   <string name="pref_plugin_telepathy">Отправка SMS</string>
   <string name="pref_plugin_telepathy_desc">Отправка SMS-сообщений с вашего компьютера</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Преименуј</string>
   <string name="refresh">Освежи</string>
   <string name="unreachable_description">Овај упарени уређај није доступан. Проверите да ли је повезан на исту мрежу.</string>
-  <string name="on_data_message">Чини се да сте на мобилној мрежи. КДЕ‑конекција ради само на локалној мрежи.</string>
   <string name="no_file_browser">Нема инсталираних прегледача фајлова.</string>
   <string name="pref_plugin_telepathy">Шаљи СМС</string>
   <string name="pref_plugin_telepathy_desc">Шаљите текстуалне поруке помоћу рачунара</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Byt namn</string>
   <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="on_data_message">Det verkar som om du använder en mobil dataanslutning. KDE-anslut fungerar bara på lokala nätverk.</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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Yeniden adlandır</string>
   <string name="refresh">Tazele</string>
   <string name="unreachable_description">Eşleştirilmiş aygıt ulaşılabilir değil. Aynı ağa bağlı olduğundan emin olun.</string>
-  <string name="on_data_message">Mobil veri bağlantısında olduğunuz gözüküyor. KDE Connect sadece yerel ağlarda çalışır.</string>
   <string name="no_file_browser">Yüklü bir dosya tarayıcısı yok.</string>
   <string name="pref_plugin_telepathy">SMS Gönder</string>
   <string name="pref_plugin_telepathy_desc">Masaüstünden metin iletisi gönder</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -162,7 +162,6 @@
   <string name="device_rename_confirm">Перейменувати</string>
   <string name="refresh">Оновити</string>
   <string name="unreachable_description">Цей пов’язаний пристрій недоступний. Переконайтеся, що його з’єднано з вашою мережею.</string>
-  <string name="on_data_message">Здається, мережа працює у режимі мобільного з’єднання. KDE Connect може працювати лише у локальних мережах.</string>
   <string name="no_file_browser">Програм для навігації файловою системою не встановлено.</string>
   <string name="pref_plugin_telepathy">Надіслати SMS</string>
   <string name="pref_plugin_telepathy_desc">Надсилати текстові повідомлення з вашої робочої станції</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -193,7 +193,7 @@
     <string name="device_rename_confirm">Rename</string>
     <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="on_data_message">It looks like you are on a mobile data connection. KDE Connect only works on local networks.</string>
+    <string name="no_network_message">It looks like you aren\'t connected to any compatible networks. Try connecting to WiFi.</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>
diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -51,6 +51,8 @@
 import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -167,7 +169,7 @@
                 }, 5*1000);
 
                 // Try to cause a reverse connection
-                onNetworkChange();
+                broadcastUdpPackage();
             }
         }
     }
@@ -203,8 +205,8 @@
                     //Device paired with and old version, we can't use it as we lack the certificate
                     BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
                         @Override
-                        public void onServiceStart(BackgroundService service) {
-                            Device device = service.getDevice(deviceId);
+                        public void onServiceStart() {
+                            Device device = BackgroundService.getDevice(deviceId);
                             if (device == null) return;
                             device.unpair();
                             //Retry as unpaired
@@ -230,8 +232,8 @@
                             e.printStackTrace();
                             BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
                                 @Override
-                                public void onServiceStart(BackgroundService service) {
-                                    Device device = service.getDevice(deviceId);
+                                public void onServiceStart() {
+                                    Device device = BackgroundService.getDevice(deviceId);
                                     if (device == null) return;
                                     device.unpair();
                                 }
@@ -362,22 +364,27 @@
     }
 
     private void broadcastUdpPackage() {
-
-        if (NetworkHelper.isOnMobileNetwork(context)) {
-            Log.w("LanLinkProvider", "On 3G network, not sending broadcast.");
+        final Set<String> destinations = NetworkHelper.getBroadcastDestinations();
+        if (destinations.isEmpty()) {
+            Log.w("LanLinkProvider", "No compatible networks for sending broadcast");
             return;
         }
 
         new Thread(new Runnable() {
             @Override
             public void run() {
+                Log.d("KDE/LanLinkProvider", "Broadcasting udp package");
+                List<String> ipList = new ArrayList<>(destinations);
 
-                String deviceListPrefs = PreferenceManager.getDefaultSharedPreferences(context).getString(CustomDevicesActivity.KEY_CUSTOM_DEVLIST_PREFERENCE, "");
-                ArrayList<String> iplist = new ArrayList<>();
+                String deviceListPrefs = PreferenceManager.getDefaultSharedPreferences(context)
+                        .getString(CustomDevicesActivity.KEY_CUSTOM_DEVLIST_PREFERENCE, "");
                 if (!deviceListPrefs.isEmpty()) {
-                    iplist = CustomDevicesActivity.deserializeIpList(deviceListPrefs);
+                    CustomDevicesActivity.deserializeIpList(deviceListPrefs, ipList);
+                }
+
+                for (String ipstr : ipList) {
+                    Log.d("KDE/LanLinkProvider", "Broadcasting to IP: " + ipstr);
                 }
-                iplist.add("255.255.255.255"); //Default: broadcast.
 
                 NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
                 identity.set("tcpPort", MIN_PORT);
@@ -389,13 +396,12 @@
                     socket.setBroadcast(true);
                     bytes = identity.serialize().getBytes(StringsHelper.UTF8);
                 } catch (Exception e) {
-                    e.printStackTrace();
-                    Log.e("KDE/LanLinkProvider","Failed to create DatagramSocket");
+                    Log.e("KDE/LanLinkProvider","Failed to create DatagramSocket", e);
                 }
 
                 if (bytes != null) {
                     //Log.e("KDE/LanLinkProvider","Sending packet to "+iplist.size()+" ips");
-                    for (String ipstr : iplist) {
+                    for (String ipstr : ipList) {
                         try {
                             InetAddress client = InetAddress.getByName(ipstr);
                             socket.send(new DatagramPacket(bytes, bytes.length, client, MIN_PORT));
diff --git a/src/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java
--- a/src/org/kde/kdeconnect/BackgroundService.java
+++ b/src/org/kde/kdeconnect/BackgroundService.java
@@ -25,6 +25,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
@@ -34,15 +35,17 @@
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 //import org.kde.kdeconnect.Backends.BluetoothBackend.BluetoothLinkProvider;
 import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.RsaHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.ConcurrentMap;
 
 public class BackgroundService extends Service {
 
@@ -52,29 +55,30 @@
         void onDeviceListChanged();
     }
 
-    private final ConcurrentHashMap<String, DeviceListChangedCallback> deviceListChangedCallbacks = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, DeviceListChangedCallback>
+            deviceListChangedCallbacks = new ConcurrentHashMap<>();
 
-    private final ArrayList<BaseLinkProvider> linkProviders = new ArrayList<>();
+    private static final List<BaseLinkProvider> linkProviders = new ArrayList<>();
 
-    private final ConcurrentHashMap<String, Device> devices = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Device> devices = new ConcurrentHashMap<>();
 
-    private final HashSet<Object> discoveryModeAcquisitions = new HashSet<>();
+    private static final Set<Object> discoveryModeAcquisitions = new HashSet<>();
 
     public static BackgroundService getInstance(){
         return instance;
     }
 
-    public boolean acquireDiscoveryMode(Object key) {
+    private static boolean acquireDiscoveryMode(Context key, boolean forceNetworkRefresh) {
         boolean wasEmpty = discoveryModeAcquisitions.isEmpty();
         discoveryModeAcquisitions.add(key);
-        if (wasEmpty) {
-            onNetworkChange();
+        if (wasEmpty || forceNetworkRefresh) {
+            BackgroundService.refreshNetwork(key, true);
         }
         //Log.e("acquireDiscoveryMode",key.getClass().getName() +" ["+discoveryModeAcquisitions.size()+"]");
         return wasEmpty;
     }
 
-    public void releaseDiscoveryMode(Object key) {
+    private static void releaseDiscoveryMode(Context key) {
         boolean removed = discoveryModeAcquisitions.remove(key);
         //Log.e("releaseDiscoveryMode",key.getClass().getName() +" ["+discoveryModeAcquisitions.size()+"]");
         if (removed && discoveryModeAcquisitions.isEmpty()) {
@@ -86,29 +90,28 @@
         addGuiInUseCounter(activity, false);
     }
 
-    public static void addGuiInUseCounter(final Context activity, final boolean forceNetworkRefresh) {
+    public static void addGuiInUseCounter(
+            final Context activity,final boolean forceNetworkRefresh) {
         BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                boolean refreshed = service.acquireDiscoveryMode(activity);
-                if (!refreshed && forceNetworkRefresh) {
-                    service.onNetworkChange();
-                }
+            public void onServiceStart() {
+                acquireDiscoveryMode(activity, forceNetworkRefresh);
             }
         });
     }
 
     public static void removeGuiInUseCounter(final Context activity) {
         BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
+            public void onServiceStart() {
                 //If no user interface is open, close the connections open to other devices
-                service.releaseDiscoveryMode(activity);
+                releaseDiscoveryMode(activity);
             }
         });
     }
 
-    private final Device.PairingCallback devicePairingCallback = new Device.PairingCallback() {
+    private static final Device.PairingCallback devicePairingCallback
+            = new Device.PairingCallback() {
         @Override
         public void incomingRequest() {
             onDeviceListChanged();
@@ -127,7 +130,7 @@
         }
     };
 
-    public void onDeviceListChanged() {
+    private static void onDeviceListChanged() {
         for(DeviceListChangedCallback callback : deviceListChangedCallbacks.values()) {
             callback.onDeviceListChanged();
         }
@@ -155,15 +158,15 @@
         }
     }
 
-    public ArrayList<BaseLinkProvider> getLinkProviders() {
-        return linkProviders;
-    }
+    //public List<BaseLinkProvider> getLinkProviders() {
+    //    return linkProviders;
+    //}
 
-    public Device getDevice(String id) {
+    public static Device getDevice(String id) {
         return devices.get(id);
     }
 
-    private void cleanDevices() {
+    private static void cleanDevices() {
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -222,44 +225,106 @@
         }
     };
 
-    public ConcurrentHashMap<String, Device> getDevices() {
-        return devices;
+    public static Collection<Device> getDevices() {
+        return devices.values();
     }
 
-    public void onNetworkChange() {
+    private static void onNetworkChange() {
         for (BaseLinkProvider a : linkProviders) {
             a.onNetworkChange();
         }
     }
 
-    public void addConnectionListener(BaseLinkProvider.ConnectionReceiver cr) {
+    private static volatile boolean networkRefreshQueued;
+    private static volatile boolean networkForceRefreshQueued;
+    private static final Object networkRefreshQueueLock = new Object();
+
+    public static void refreshNetwork(Context context) {
+        refreshNetwork(context, false);
+    }
+
+    public static void refreshNetwork(final Context context, final boolean force) {
+        /*
+         * Refreshing Network may be costly, so don't do it unless necessary.
+         *
+         * During launch, and on network changes,
+         * many broadcasts are received, some of which are duplicate for our purposes.
+         *
+         * Repeated calls in succession are thus filtered out.
+         */
+        if (networkForceRefreshQueued || (!force && networkRefreshQueued)) {
+            return;
+        }
+        synchronized (networkRefreshQueueLock) {
+            if (networkForceRefreshQueued) {
+                return;
+            }
+            if (force) {
+                networkForceRefreshQueued = true;
+            } else if (networkRefreshQueued) {
+                return;
+            }
+            networkRefreshQueued = true;
+        }
+        BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
+            @Override
+            public void onServiceStart() {
+                Log.d("KDE/BackgroundService",
+                        force ? "Force refreshing network" : "Refreshing network");
+                networkRefreshQueued = false;
+                if (force) {
+                    networkForceRefreshQueued = false;
+                    NetworkHelper.refreshBroadcastDestinations();
+                }
+                onNetworkChange();
+                if (force) {
+                    onDeviceListChanged();
+                }
+            }
+        });
+    }
+
+    public static void addConnectionListener(BaseLinkProvider.ConnectionReceiver cr) {
         for (BaseLinkProvider a : linkProviders) {
             a.addConnectionReceiver(cr);
         }
     }
 
-    public void removeConnectionListener(BaseLinkProvider.ConnectionReceiver cr) {
+    public static void removeConnectionListener(BaseLinkProvider.ConnectionReceiver cr) {
         for (BaseLinkProvider a : linkProviders) {
             a.removeConnectionReceiver(cr);
         }
     }
 
-    public void addDeviceListChangedCallback(String key, DeviceListChangedCallback callback) {
+    public static void addDeviceListChangedCallback(String key, DeviceListChangedCallback callback) {
         deviceListChangedCallbacks.put(key, callback);
     }
-    public void removeDeviceListChangedCallback(String key) {
+    public static void removeDeviceListChangedCallback(String key) {
         deviceListChangedCallbacks.remove(key);
     }
 
     //This will called only once, even if we launch the service intent several times
     @Override
     public void onCreate() {
         super.onCreate();
 
+        if (instance != null) {
+            throw new AssertionError();
+        }
         instance = this;
 
-        // Register screen on listener
-        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+        // Register listeners that Android would have ignored if they were in the manifest
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_SCREEN_ON);
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        //filter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
+        //filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        // Private API Listeners
+        filter.addAction("android.net.wifi.WIFI_HOTSPOT_CLIENTS_CHANGED");
+        //filter.addAction("android.net.wifi.WIFI_AP_STATE_CHANGED");
+        filter.addAction("android.net.conn.TETHER_STATE_CHANGED");
+        // Non-standard Listener for some ROMs
+        filter.addAction("codeaurora.net.conn.TETHER_CONNECT_STATE_CHANGED");
         registerReceiver(new KdeConnectBroadcastReceiver(), filter);
 
         Log.i("KDE/BackgroundService", "Service not started yet, initializing...");
@@ -276,7 +341,7 @@
         }
     }
 
-    void initializeSecurityParameters() {
+    private void initializeSecurityParameters() {
         RsaHelper.initialiseRsaKeys(this);
         SslHelper.initialiseCertificate(this);
     }
@@ -286,6 +351,7 @@
         for (BaseLinkProvider a : linkProviders) {
             a.onStop();
         }
+        //removeConnectionListener(deviceListener);
         super.onDestroy();
     }
 
@@ -298,42 +364,40 @@
     //To use the service from the gui
 
     public interface InstanceCallback {
-        void onServiceStart(BackgroundService service);
+        void onServiceStart();
     }
 
-    private final static ArrayList<InstanceCallback> callbacks = new ArrayList<>();
-
-    private final static Lock mutex = new ReentrantLock(true);
+    private static final List<InstanceCallback> callbacks = new ArrayList<>();
+    private static final Object commandThreadLock = new Object();
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        //This will be called for each intent launch, even if the service is already started and it is reused
-        mutex.lock();
-        try {
-            for (InstanceCallback c : callbacks) {
-                c.onServiceStart(this);
+        // This will be called for each intent launch,
+        // even if the service is already started and it is reused
+        synchronized (commandThreadLock) {
+            List<InstanceCallback> callbacksCopy;
+            synchronized (callbacks) {
+                if (callbacks.isEmpty()) {
+                    return Service.START_STICKY;
+                }
+                callbacksCopy = new ArrayList<>(callbacks);
+                callbacks.clear();
+            }
+            for (InstanceCallback c : callbacksCopy) {
+                c.onServiceStart();
             }
-            callbacks.clear();
-        } finally {
-            mutex.unlock();
         }
-        return Service.START_STICKY;
-    }
 
-    public static void Start(Context c) {
-        RunCommand(c, null);
+        return Service.START_STICKY;
     }
 
     public static void RunCommand(final Context c, final InstanceCallback callback) {
         new Thread(new Runnable() {
             @Override
             public void run() {
                 if (callback != null) {
-                    mutex.lock();
-                    try {
+                    synchronized (callbacks) {
                         callbacks.add(callback);
-                    } finally {
-                        mutex.unlock();
                     }
                 }
                 Intent serviceIntent = new Intent(c, BackgroundService.class);
diff --git a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java
--- a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java
@@ -1,58 +1,75 @@
 package org.kde.kdeconnect.Helpers;
 
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkInfo;
 import android.util.Log;
 
-import java.io.FileReader;
-import java.io.LineNumberReader;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 public class NetworkHelper {
+    // TODO User settings for using 255.255.255.255
+    private static boolean useOldLogic;
 
-    public static boolean isOnMobileNetwork(Context context) {
-        if (context == null) {
-            return false;
+    private static final Set<String> cachedBroadcastDestinations = new HashSet<>();
+    private static final Set<String> cachedBroadcastDestinationsReadonlyView =
+            Collections.unmodifiableSet(cachedBroadcastDestinations);
+
+    public static boolean isOnline() {
+        return !cachedBroadcastDestinations.isEmpty();
+    }
+
+    public static Set<String> getBroadcastDestinations() {
+        return cachedBroadcastDestinationsReadonlyView;
+    }
+
+    public static void refreshBroadcastDestinations() {
+        synchronized (cachedBroadcastDestinationsReadonlyView) {
+            cachedBroadcastDestinations.clear();
+            discoverNetworkBroadcastDestinations(cachedBroadcastDestinations);
         }
-        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
-            return false; //No good way to know it
+    }
+
+    private static Set<String> discoverNetworkBroadcastDestinations(Set<String> addresses) {
+        if (useOldLogic) {
+            addresses.add("255.255.255.255");
+        } else {
+            addNetworkInterfaceBroadcastAddresses(addresses);
         }
+        return addresses;
+    }
+
+    private static void addNetworkInterfaceBroadcastAddresses(Set<String> addresses) {
         try {
-            boolean mobile = false;
-            final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            Network[] networks = connMgr.getAllNetworks();
-            for (Network network : networks) {
-                NetworkInfo info = connMgr.getNetworkInfo(network);
-                if (info == null) {
+            for (NetworkInterface iface :
+                    Collections.list(NetworkInterface.getNetworkInterfaces())) {
+                if (!iface.isUp()) {
+                    // Down interfaces might still have addresses (bug?),
+                    // but they are always unreachable.
                     continue;
                 }
-                if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
-                    mobile = info.isConnected();
+                if (!isInterfaceNameCompatible(iface.getName())) {
                     continue;
                 }
-                //Log.e(info.getTypeName(),""+info.isAvailable());
-                if (info.isAvailable()) return false; //We are connected to at least one non-mobile network
-            }
-            if (mobile) { //We suspect we are on a mobile net
-                try {
-                    //Check the number of network neighbours, on data it should be 0
-                    LineNumberReader is = new LineNumberReader(new FileReader("/proc/net/arp"));
-                    is.skip(Long.MAX_VALUE);
-                    //Log.e("NetworkHelper", "procnetarp has " + is.getLineNumber() + " lines");
-                    if (is.getLineNumber() > 1) { //The first line are the headers
-                        return false; //I have neighbours, so this doesn't look like a mobile network
+                for (InterfaceAddress addr : iface.getInterfaceAddresses()) {
+                    InetAddress broadcastAddr = addr.getBroadcast();
+                    if (broadcastAddr == null) {
+                        continue;
                     }
-                } catch (Exception e) {
-                    Log.e("NetworkHelper", "Exception reading procnetarp");
-                    e.printStackTrace();
+                    addresses.add(broadcastAddr.getHostAddress());
                 }
             }
-        } catch(Exception e) {
-            e.printStackTrace();
-            Log.d("isOnMobileNetwork", "Something went wrong, but this is non-critical.");
+        } catch (Exception e) {
+            Log.e("NetworkHelper", "Exception with NetworkInterface broadcast addresses", e);
         }
-        return false;
     }
 
+    private static boolean isInterfaceNameCompatible(String name) {
+        return  name.startsWith("wlan") // Regular WiFi / WiFi Tethering
+                || name.equals("bt-pan") // Bluetooth Tethering
+                || name.startsWith("rndis"); // USB Tethering
+        // We don't want to use interfaces like mobile data
+    }
 }
diff --git a/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java b/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
--- a/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
+++ b/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
@@ -24,7 +24,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
 import android.util.Log;
 
 public class KdeConnectBroadcastReceiver extends BroadcastReceiver
@@ -34,51 +33,33 @@
     public void onReceive(Context context, Intent intent) {
 
         //Log.e("KdeConnect", "Broadcast event: "+intent.getAction());
-
-        String action = intent.getAction();
-
-        switch(action) {
+        switch(intent.getAction()) {
             case Intent.ACTION_PACKAGE_REPLACED:
                 Log.i("KdeConnect", "UpdateReceiver");
                 if (!intent.getData().getSchemeSpecificPart().equals(context.getPackageName())) {
                     Log.i("KdeConnect", "Ignoring, it's not me!");
                     return;
                 }
-                BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
-                    @Override
-                    public void onServiceStart(BackgroundService service) {
-
-                    }
-                });
+                BackgroundService.RunCommand(context, null);
                 break;
             case Intent.ACTION_BOOT_COMPLETED:
                 Log.i("KdeConnect", "KdeConnectBroadcastReceiver");
-                BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
-                    @Override
-                    public void onServiceStart(BackgroundService service) {
-
-                    }
-                });
+                BackgroundService.RunCommand(context, null);
                 break;
-            case WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION:
-            case WifiManager.WIFI_STATE_CHANGED_ACTION:
+            //case WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION:
+            //case WifiManager.WIFI_STATE_CHANGED_ACTION:
             case ConnectivityManager.CONNECTIVITY_ACTION:
+            // Private API Listeners
+            case "android.net.conn.TETHER_STATE_CHANGED":
+            //case "android.net.wifi.WIFI_AP_STATE_CHANGED":
+            case "android.net.wifi.WIFI_HOTSPOT_CLIENTS_CHANGED":
+            // Non-standard Listener for some ROMs
+            case "codeaurora.net.conn.TETHER_CONNECT_STATE_CHANGED":
                 Log.i("KdeConnect", "Connection state changed, trying to connect");
-                BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
-                    @Override
-                    public void onServiceStart(BackgroundService service) {
-                        service.onDeviceListChanged();
-                        service.onNetworkChange();
-                    }
-                });
+                BackgroundService.refreshNetwork(context, true);
                 break;
             case Intent.ACTION_SCREEN_ON:
-                BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
-                    @Override
-                    public void onServiceStart(BackgroundService service) {
-                        service.onNetworkChange();
-                    }
-                });
+                BackgroundService.refreshNetwork(context);
                 break;
             default:
                 Log.i("BroadcastReceiver", "Ignoring broadcast event: "+intent.getAction());
diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
--- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
+++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java
@@ -109,8 +109,8 @@
     private void sendKeyPressPackage(final NetworkPackage np) {
         BackgroundService.RunCommand(getContext(), new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendKeyboardPacket(np);
diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
--- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java
@@ -210,8 +210,8 @@
                 mCurrentY = event.getY();
                 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                         if (mousePadPlugin == null) return;
                         mousePadPlugin.sendMouseDelta(mCurrentX - mPrevX, mCurrentY - mPrevY, mCurrentSensitivity);
@@ -285,8 +285,8 @@
 
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendSingleHold();
@@ -303,8 +303,8 @@
     public boolean onSingleTapConfirmed(MotionEvent e) {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendSingleClick();
@@ -317,8 +317,8 @@
     public boolean onDoubleTap(MotionEvent e) {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendDoubleClick();
@@ -364,8 +364,8 @@
     private void sendMiddleClick() {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendMiddleClick();
@@ -376,8 +376,8 @@
     private void sendRightClick() {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendRightClick();
@@ -388,8 +388,8 @@
     private void sendSingleHold() {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendSingleHold();
@@ -400,8 +400,8 @@
     private void sendScroll(final float y) {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(deviceId);
                 MousePadPlugin mousePadPlugin = device.getPlugin(MousePadPlugin.class);
                 if (mousePadPlugin == null) return;
                 mousePadPlugin.sendScroll(0, y);
diff --git a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
--- a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
@@ -73,9 +73,9 @@
 
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
+            public void onServiceStart() {
 
-                final Device device = service.getDevice(deviceId);
+                final Device device = BackgroundService.getDevice(deviceId);
                 final MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                 if (mpris == null) {
                     Log.e("MprisActivity", "device has no mpris plugin!");
@@ -226,8 +226,8 @@
         super.onDestroy();
         BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.removeConnectionListener(connectionReceiver);
+            public void onServiceStart() {
+                BackgroundService.removeConnectionListener(connectionReceiver);
             }
         });
     }
@@ -257,8 +257,8 @@
             case KeyEvent.KEYCODE_VOLUME_UP:
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         updateVolume(mpris, 5);
@@ -268,8 +268,8 @@
             case KeyEvent.KEYCODE_VOLUME_DOWN:
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         updateVolume(mpris, -5);
@@ -309,8 +309,8 @@
 
         BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.addConnectionListener(connectionReceiver);
+            public void onServiceStart() {
+                BackgroundService.addConnectionListener(connectionReceiver);
             }
         });
         connectToPlugin();
@@ -320,8 +320,8 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         mpris.sendAction("PlayPause");
@@ -335,8 +335,8 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         mpris.sendAction("Previous");
@@ -350,8 +350,8 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         mpris.Seek(interval_time * -1);
@@ -365,8 +365,8 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         mpris.Seek(interval_time);
@@ -380,8 +380,8 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         mpris.sendAction("Next");
@@ -403,8 +403,8 @@
             public void onStopTrackingTouch(final SeekBar seekBar) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris == null) return;
                         mpris.setVolume(seekBar.getProgress());
@@ -420,8 +420,8 @@
                 final SeekBar positionSeek = (SeekBar)findViewById(R.id.positionSeek);
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         if (device != null) {
                             MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                             if (mpris != null) {
@@ -452,8 +452,8 @@
             public void onStopTrackingTouch(final SeekBar seekBar) {
                 BackgroundService.RunCommand(MprisActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(deviceId);
                         MprisPlugin mpris = device.getPlugin(MprisPlugin.class);
                         if (mpris != null) {
                             mpris.setPosition(seekBar.getProgress());
diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
@@ -46,10 +46,8 @@
 import java.io.ByteArrayOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
diff --git a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/RepliableNotification.java b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/RepliableNotification.java
--- a/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/RepliableNotification.java
+++ b/src/org/kde/kdeconnect/Plugins/NotificationsPlugin/RepliableNotification.java
@@ -1,8 +1,6 @@
 package org.kde.kdeconnect.Plugins.NotificationsPlugin;
- 
-import android.app.Notification;
+
 import android.app.PendingIntent;
-import android.os.Bundle;
 
 import java.util.ArrayList;
 import java.util.UUID;
diff --git a/src/org/kde/kdeconnect/Plugins/Plugin.java b/src/org/kde/kdeconnect/Plugins/Plugin.java
--- a/src/org/kde/kdeconnect/Plugins/Plugin.java
+++ b/src/org/kde/kdeconnect/Plugins/Plugin.java
@@ -20,7 +20,6 @@
 
 package org.kde.kdeconnect.Plugins;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -31,13 +30,11 @@
 import android.support.annotation.StringRes;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
-import org.kde.kdeconnect.UserInterface.MaterialActivity;
 import org.kde.kdeconnect.UserInterface.PluginSettingsActivity;
 import org.kde.kdeconnect.UserInterface.SettingsActivity;
 import org.kde.kdeconnect_tp.R;
diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java
--- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java
@@ -46,9 +46,9 @@
     private void updateView() {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(final BackgroundService service) {
+            public void onServiceStart() {
 
-                final Device device = service.getDevice(deviceId);
+                final Device device = BackgroundService.getDevice(deviceId);
                 final RunCommandPlugin plugin = device.getPlugin(RunCommandPlugin.class);
                 if (plugin == null) {
                     Log.e("RunCommandActivity", "device has no runcommand plugin!");
@@ -118,9 +118,9 @@
 
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(final BackgroundService service) {
+            public void onServiceStart() {
 
-                final Device device = service.getDevice(deviceId);
+                final Device device = BackgroundService.getDevice(deviceId);
                 final RunCommandPlugin plugin = device.getPlugin(RunCommandPlugin.class);
                 if (plugin == null) {
                     Log.e("RunCommandActivity", "device has no runcommand plugin!");
@@ -137,9 +137,9 @@
 
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(final BackgroundService service) {
+            public void onServiceStart() {
 
-                final Device device = service.getDevice(deviceId);
+                final Device device = BackgroundService.getDevice(deviceId);
                 final RunCommandPlugin plugin = device.getPlugin(RunCommandPlugin.class);
                 if (plugin == null) {
                     Log.e("RunCommandActivity", "device has no runcommand plugin!");
diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
--- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java
@@ -21,15 +21,8 @@
 package org.kde.kdeconnect.Plugins.SftpPlugin;
 
 import android.Manifest;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
 
-import org.json.JSONException;
 import org.kde.kdeconnect.Helpers.StorageHelper;
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.Plugins.Plugin;
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java
@@ -89,8 +89,8 @@
                     } else {
                         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
                             @Override
-                            public void onServiceStart(BackgroundService service) {
-                                Device device = service.getDevice(mDeviceId);
+                            public void onServiceStart() {
+                                Device device = BackgroundService.getDevice(mDeviceId);
                                 if (device == null) {
                                     Log.e("SendFileActivity", "Device is null");
                                     finish();
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
@@ -21,7 +21,6 @@
 package org.kde.kdeconnect.Plugins.SharePlugin;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
@@ -33,17 +32,14 @@
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
-import android.widget.Toast;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.UserInterface.List.EntryItem;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
 import org.kde.kdeconnect_tp.R;
 
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -73,12 +69,7 @@
 
     private void updateComputerListAction() {
         updateComputerList();
-        BackgroundService.RunCommand(ShareActivity.this, new BackgroundService.InstanceCallback() {
-            @Override
-            public void onServiceStart(BackgroundService service) {
-                service.onNetworkChange();
-            }
-        });
+        BackgroundService.refreshNetwork(this);
 
         mSwipeRefreshLayout.setRefreshing(true);
         new Thread(new Runnable() {
@@ -107,9 +98,9 @@
 
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(final BackgroundService service) {
+            public void onServiceStart() {
 
-                Collection<Device> devices = service.getDevices().values();
+                Collection<Device> devices = BackgroundService.getDevices();
                 final ArrayList<Device> devicesList = new ArrayList<>();
                 final ArrayList<ListAdapter.Item> items = new ArrayList<>();
 
@@ -176,9 +167,9 @@
             BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback(){
 
                 @Override
-                public void onServiceStart(BackgroundService service) {
-                    Log.d("DirectShare", "sharing to "+service.getDevice(deviceId).getName());
-                    Device device = service.getDevice(deviceId);
+                public void onServiceStart() {
+                    Device device = BackgroundService.getDevice(deviceId);
+                    Log.d("DirectShare", "sharing to "+ device.getName());
                     if (device.isReachable() && device.isPaired()) {
                         SharePlugin.share(intent, device);
                     }
@@ -188,11 +179,11 @@
         } else {
 
             BackgroundService.addGuiInUseCounter(this);
+            BackgroundService.refreshNetwork(this);
             BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
                 @Override
-                public void onServiceStart(BackgroundService service) {
-                    service.onNetworkChange();
-                    service.addDeviceListChangedCallback("ShareActivity", new BackgroundService.DeviceListChangedCallback() {
+                public void onServiceStart() {
+                    BackgroundService.addDeviceListChangedCallback("ShareActivity", new BackgroundService.DeviceListChangedCallback() {
                         @Override
                         public void onDeviceListChanged() {
                             updateComputerList();
@@ -209,8 +200,8 @@
     protected void onStop() {
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.removeDeviceListChangedCallback("ShareActivity");
+            public void onServiceStart() {
+                BackgroundService.removeDeviceListChangedCallback("ShareActivity");
             }
         });
         BackgroundService.removeGuiInUseCounter(this);
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareChooserTargetService.java
@@ -42,7 +42,7 @@
     public List<ChooserTarget> onGetChooserTargets(ComponentName targetActivityName, IntentFilter matchedFilter) {
         Log.d("DirectShare", "invoked");
         final List<ChooserTarget> targets = new ArrayList<>();
-        for(Device d: BackgroundService.getInstance().getDevices().values()){
+        for(Device d : BackgroundService.getDevices()){
             if(d.isReachable() && d.isPaired()) {
                 Log.d("DirectShare", d.getName());
                 final String targetName = d.getName();
diff --git a/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java b/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
--- a/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
@@ -22,18 +22,17 @@
 
 import android.Manifest;
 import android.content.pm.PackageManager;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.telephony.SmsManager;
 import android.util.Log;
 
-import java.util.ArrayList;
-
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin;
 import org.kde.kdeconnect_tp.R;
 
+import java.util.ArrayList;
+
 public class TelepathyPlugin extends Plugin {
 
 
diff --git a/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
--- a/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java
@@ -27,6 +27,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBarActivity;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
@@ -41,6 +42,8 @@
 import org.kde.kdeconnect_tp.R;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class CustomDevicesActivity extends ActionBarActivity {
 
@@ -50,7 +53,7 @@
 
     private ListView list;
 
-    private ArrayList<String> ipAddressList = new ArrayList<>();
+    private List<String> ipAddressList = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -148,44 +151,25 @@
 
     private void saveList() {
         // add entry to list and save to preferences (unless empty)
-        String serialized = "";
-        if (!ipAddressList.isEmpty()) {
-            serialized = serializeIpList(ipAddressList);
-        }
         PreferenceManager.getDefaultSharedPreferences(CustomDevicesActivity.this).edit().putString(
-                KEY_CUSTOM_DEVLIST_PREFERENCE, serialized).commit();
+                KEY_CUSTOM_DEVLIST_PREFERENCE, serializeIpList(ipAddressList)).commit();
         ((ArrayAdapter)list.getAdapter()).notifyDataSetChanged();
 
     }
 
-    public static String serializeIpList(ArrayList<String> ipList) {
-        String serialized = "";
-        for (String ipAddress : ipList) {
-            serialized += IP_DELIM+ipAddress;
-        }
-        // remove first delimiter
-        serialized = serialized.substring(IP_DELIM.length());
-        return serialized;
+    public static String serializeIpList(List<String> ipList) {
+        return TextUtils.join(IP_DELIM, ipList);
     }
 
-    public static ArrayList<String> deserializeIpList(String serialized) {
-        ArrayList<String> ipList = new ArrayList<>();
-        for (String ipAddress : serialized.split(IP_DELIM)) {
-            ipList.add(ipAddress);
-        }
-        return ipList;
+    public static List<String> deserializeIpList(String serialized, List<String> target) {
+        Collections.addAll(target, serialized.split(IP_DELIM));
+        return target;
     }
 
     private void initializeDeviceList(Context context){
-        String deviceListPrefs = PreferenceManager.getDefaultSharedPreferences(context).getString(
-                KEY_CUSTOM_DEVLIST_PREFERENCE, "");
-        if(deviceListPrefs.isEmpty()){
-            PreferenceManager.getDefaultSharedPreferences(context).edit().putString(
-                    KEY_CUSTOM_DEVLIST_PREFERENCE,
-                    deviceListPrefs).commit();
-        } else {
-            ipAddressList = deserializeIpList(deviceListPrefs);
-        }
+        String deviceListPrefs = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(KEY_CUSTOM_DEVLIST_PREFERENCE, "");
+        ipAddressList = deserializeIpList(deviceListPrefs, new ArrayList<String>());
     }
 
     @Override
diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
--- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
@@ -112,8 +112,8 @@
 
         BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                device = service.getDevice(mDeviceId);
+            public void onServiceStart() {
+                device = BackgroundService.getDevice(mDeviceId);
                 if (device == null) {
                     Log.e("DeviceFragment", "Trying to display a device fragment but the device is not present");
                     mActivity.onDeviceSelected(null);
@@ -139,8 +139,8 @@
                 rootView.findViewById(R.id.pair_progress).setVisibility(View.VISIBLE);
                 BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        device = service.getDevice(deviceId);
+                    public void onServiceStart() {
+                        device = BackgroundService.getDevice(deviceId);
                         if (device == null) return;
                         device.requestPairing();
                     }
@@ -153,7 +153,7 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
+                    public void onServiceStart() {
                         if (device != null) {
                             device.acceptPairing();
                             rootView.findViewById(R.id.pairing_buttons).setVisibility(View.GONE);
@@ -168,7 +168,7 @@
             public void onClick(View view) {
                 BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
+                    public void onServiceStart() {
                         if (device != null) {
                             //Remove listener so buttons don't show for a while before changing the view
                             device.removePluginsChangedListener(pluginsChangedListener);
@@ -195,8 +195,8 @@
     public void onDestroyView() {
         BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                Device device = service.getDevice(mDeviceId);
+            public void onServiceStart() {
+                Device device = BackgroundService.getDevice(mDeviceId);
                 if (device == null) return;
                 device.removePluginsChangedListener(pluginsChangedListener);
                 device.removePairingCallback(pairingCallback);
@@ -327,14 +327,20 @@
                     rootView.findViewById(R.id.pair_button).setVisibility(View.GONE);
                     rootView.findViewById(R.id.pair_request).setVisibility(View.VISIBLE);
                 } else {
-
                     boolean paired = device.isPaired();
-                    boolean reachable = device.isReachable();
-                    boolean onData = NetworkHelper.isOnMobileNetwork(getContext());
-
-                    rootView.findViewById(R.id.pairing_buttons).setVisibility(paired ? View.GONE : View.VISIBLE);
-                    rootView.findViewById(R.id.not_reachable_message).setVisibility((paired && !reachable && !onData) ? View.VISIBLE : View.GONE);
-                    rootView.findViewById(R.id.on_data_message).setVisibility((paired && !reachable && onData) ? View.VISIBLE : View.GONE);
+                    boolean online = NetworkHelper.isOnline();
+                    boolean reachable = online && device.isReachable();
+
+                    rootView.findViewById(R.id.pairing_buttons).setVisibility(
+                            paired ? View.GONE : View.VISIBLE);
+                    rootView.findViewById(R.id.not_reachable_message).setVisibility(
+                            (paired && !reachable) ? View.VISIBLE : View.GONE);
+                    rootView.findViewById(R.id.no_network_message).setVisibility(
+                            (paired && !online) ? View.VISIBLE : View.GONE);
+
+                    if (!reachable) {
+                        return;
+                    }
 
                     try {
                         pluginListItems = new ArrayList<>();
@@ -353,7 +359,7 @@
                             }));
                         }
 
-                        createPluginsList(device.getFailedPlugins(), R.string.plugins_failed_to_load, new PluginClickListener() {
+                        createPluginsList(device.getFailedPlugins(),R.string.plugins_failed_to_load, new PluginClickListener() {
                             @Override
                             void action() {
                                 plugin.getErrorDialog(mActivity).show();
@@ -439,8 +445,8 @@
     public static void acceptPairing(final String devId, final MaterialActivity activity) {
         final DeviceFragment frag = new DeviceFragment(devId, activity);
         BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
-            public void onServiceStart(BackgroundService service) {
-                Device dev = service.getDevice(devId);
+            public void onServiceStart() {
+                Device dev = BackgroundService.getDevice(devId);
                 if (dev == null) {
                     Log.w("rejectPairing", "Device no longer exists: "+devId);
                     return;
@@ -462,8 +468,8 @@
     public static void rejectPairing(final String devId, final MaterialActivity activity) {
         final DeviceFragment frag = new DeviceFragment(devId, activity);
         BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
-            public void onServiceStart(BackgroundService service) {
-                Device dev = service.getDevice(devId);
+            public void onServiceStart() {
+                Device dev = BackgroundService.getDevice(devId);
                 if (dev == null) {
                     Log.w("rejectPairing", "Device no longer exists: "+devId);
                     return;
diff --git a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
--- a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java
@@ -1,6 +1,5 @@
 package org.kde.kdeconnect.UserInterface;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -11,7 +10,6 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -178,15 +176,15 @@
 
         BackgroundService.RunCommand(MaterialActivity.this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(final BackgroundService service) {
+            public void onServiceStart() {
 
                 Menu menu = mNavigationView.getMenu();
 
                 menu.clear();
                 mMapMenuToDeviceId.clear();
 
                 int id = 0;
-                Collection<Device> devices = service.getDevices().values();
+                Collection<Device> devices = BackgroundService.getDevices();
                 for (Device device : devices) {
                     if (device.isReachable() && device.isPaired()) {
                         MenuItem item = menu.add(0, id++, 0, device.getName());
@@ -212,8 +210,8 @@
         BackgroundService.addGuiInUseCounter(this, true);
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.addDeviceListChangedCallback("MaterialActivity", new BackgroundService.DeviceListChangedCallback() {
+            public void onServiceStart() {
+                BackgroundService.addDeviceListChangedCallback("MaterialActivity", new BackgroundService.DeviceListChangedCallback() {
                     @Override
                     public void onDeviceListChanged() {
                         updateComputerList();
@@ -229,8 +227,8 @@
         BackgroundService.removeGuiInUseCounter(this);
         BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.removeDeviceListChangedCallback("MaterialActivity");
+            public void onServiceStart() {
+                BackgroundService.removeDeviceListChangedCallback("MaterialActivity");
             }
         });
         super.onStop();
@@ -286,8 +284,8 @@
             case RESULT_NEEDS_RELOAD:
                 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(mCurrentDevice);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(mCurrentDevice);
                         device.reloadPluginsFromSettings();
                     }
                 });
@@ -304,8 +302,8 @@
                 //New permission granted, reload plugins
                 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() {
                     @Override
-                    public void onServiceStart(BackgroundService service) {
-                        Device device = service.getDevice(mCurrentDevice);
+                    public void onServiceStart() {
+                        Device device = BackgroundService.getDevice(mCurrentDevice);
                         device.reloadPluginsFromSettings();
                     }
                 });
@@ -332,12 +330,7 @@
                         String deviceName = deviceNameEdit.getText().toString();
                         DeviceHelper.setDeviceName(MaterialActivity.this, deviceName);
                         nameView.setText(deviceName);
-                        BackgroundService.RunCommand(MaterialActivity.this, new BackgroundService.InstanceCallback() {
-                            @Override
-                            public void onServiceStart(final BackgroundService service) {
-                                service.onNetworkChange();
-                            }
-                        });
+                        BackgroundService.refreshNetwork(MaterialActivity.this);
                     }
                 })
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -103,12 +103,7 @@
 
     private void updateComputerListAction() {
         updateComputerList();
-        BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
-            @Override
-            public void onServiceStart(BackgroundService service) {
-                service.onNetworkChange();
-            }
-        });
+        BackgroundService.refreshNetwork(mActivity, true);
         mSwipeRefreshLayout.setRefreshing(true);
         new Thread(new Runnable() {
             @Override
@@ -127,7 +122,7 @@
     private void updateComputerList() {
         BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(final BackgroundService service) {
+            public void onServiceStart() {
                 mActivity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
@@ -145,13 +140,15 @@
                         }
                         listRefreshCalledThisFrame = true;
 
-                        headerText.setText(getString(NetworkHelper.isOnMobileNetwork(getContext()) ? R.string.on_data_message : R.string.pairing_description));
+                        headerText.setText(getString(!NetworkHelper.isOnline() ?
+                                R.string.no_network_message :
+                                R.string.pairing_description));
                         //Disable tap animation
                         headerText.setOnClickListener(null);
                         headerText.setOnLongClickListener(null);
 
                         try {
-                            Collection<Device> devices = service.getDevices().values();
+                            Collection<Device> devices = BackgroundService.getDevices();
                             final ArrayList<ListAdapter.Item> items = new ArrayList<>();
 
                             SectionItem section;
@@ -223,8 +220,8 @@
         super.onStart();
         BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.addDeviceListChangedCallback("PairingFragment", new BackgroundService.DeviceListChangedCallback() {
+            public void onServiceStart() {
+                BackgroundService.addDeviceListChangedCallback("PairingFragment", new BackgroundService.DeviceListChangedCallback() {
                     @Override
                     public void onDeviceListChanged() {
                         updateComputerList();
@@ -241,8 +238,8 @@
         mSwipeRefreshLayout.setEnabled(false);
         BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                service.removeDeviceListChangedCallback("PairingFragment");
+            public void onServiceStart() {
+                BackgroundService.removeDeviceListChangedCallback("PairingFragment");
             }
         });
     }
diff --git a/src/org/kde/kdeconnect/UserInterface/SettingsActivity.java b/src/org/kde/kdeconnect/UserInterface/SettingsActivity.java
--- a/src/org/kde/kdeconnect/UserInterface/SettingsActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsActivity.java
@@ -46,8 +46,8 @@
 
         BackgroundService.RunCommand(getApplicationContext(), new BackgroundService.InstanceCallback() {
             @Override
-            public void onServiceStart(BackgroundService service) {
-                final Device device = service.getDevice(deviceId);
+            public void onServiceStart() {
+                final Device device = BackgroundService.getDevice(deviceId);
                 if (device == null) {
                     SettingsActivity.this.runOnUiThread(new Runnable() {
                         @Override