diff --git a/src/org/kde/kdeconnect/Backends/BaseLink.java b/src/org/kde/kdeconnect/Backends/BaseLink.java index df4991f2..0cc82ddb 100644 --- a/src/org/kde/kdeconnect/Backends/BaseLink.java +++ b/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. diff --git a/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java b/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java index daedd857..d2c09f3b 100644 --- a/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java +++ b/src/org/kde/kdeconnect/Backends/BaseLinkProvider.java @@ -34,16 +34,16 @@ public abstract class BaseLinkProvider { } //These two should be called when the provider links to a new computer - protected void connectionAccepted(@NonNull final String deviceId, + 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); } } - public void connectionLost(BaseLink link) { + public void onConnectionLost(BaseLink link) { //Log.i("KDE/LinkProvider", "connectionLost"); for(ConnectionReceiver cr : connectionReceivers) { cr.onConnectionLost(link); diff --git a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java index 125d59c7..eaa4aadc 100644 --- a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java +++ b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java @@ -65,7 +65,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider { return; } visibleDevices.put(deviceId, link); - connectionAccepted(deviceId, certificate, identityPacket, link); + onConnectionReceived(deviceId, certificate, identityPacket, link); link.startListening(); if (oldLink != null) { Log.i("BluetoothLinkProvider", "Removing old connection to same device"); @@ -130,7 +130,7 @@ public class BluetoothLinkProvider extends BaseLinkProvider { public void disconnectedLink(BluetoothLink link, String deviceId, BluetoothDevice remoteAddress) { sockets.remove(remoteAddress); visibleDevices.remove(deviceId); - connectionLost(link); + onConnectionLost(link); } private class ServerRunnable implements Runnable { diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java index c7381ae2..e5a0b9ee 100644 --- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java +++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java @@ -91,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"); - getLinkProvider().connectionLost(LanLink.this); + getLinkProvider().onConnectionLost(LanLink.this); } } }); diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java index e15cf50e..8094e3e7 100644 --- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java +++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java @@ -68,10 +68,10 @@ public class LanLinkProvider extends BaseLinkProvider { private boolean listening = false; - public void connectionLost(BaseLink link) { + public void onConnectionLost(BaseLink link) { String deviceId = link.getDeviceId(); visibleDevices.remove(deviceId); - super.connectionLost(link); + super.onConnectionLost(link); } //They received my UDP broadcast and are connecting to me. The first thing they send should be their identity packet. @@ -248,7 +248,7 @@ public class LanLinkProvider extends BaseLinkProvider { //Let's create the link LanLink link = new LanLink(context, deviceId, this, socket); visibleDevices.put(deviceId, link); - connectionAccepted(deviceId, certificate, identityPacket, link); + onConnectionReceived(deviceId, certificate, identityPacket, link); } } diff --git a/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java b/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java index 14fc9b5c..5c71d9ba 100644 --- a/src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java +++ b/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