diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java index e8416aa2..5c7a0cee 100644 --- a/src/org/kde/kdeconnect/Device.java +++ b/src/org/kde/kdeconnect/Device.java @@ -197,10 +197,15 @@ public class Device implements BaseLink.PacketReceiver { SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE); preferences.edit().putBoolean(deviceInfo.id, true).apply(); - reloadPluginsFromSettings(); + try { + reloadPluginsFromSettings(); - for (PairingHandler.PairingCallback cb : pairingCallbacks) { - cb.pairingSuccessful(); + for (PairingHandler.PairingCallback cb : pairingCallbacks) { + cb.pairingSuccessful(); + } + } catch (Exception e) { + Log.e("PairingHandler", "Exception in pairingSuccessful. Not unpairing because saving the trusted device succeeded"); + e.printStackTrace(); } }