mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 14:45:08 +00:00
Code Issues Releases Wiki Activity

Cosmetic changes to variable names

Browse Source
This commit is contained in:
Albert Vaca
2016-06-02 12:20:04 +02:00
parent a0d2a61ce9
commit ebbf5d165c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
View File

@@ -154,6 +154,7 @@ public class LanLinkProvider extends BaseLinkProvider {
return; return;
} }
final Channel channel = ctx.channel();
final NetworkPackage np = NetworkPackage.unserialize(message); final NetworkPackage np = NetworkPackage.unserialize(message);
if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) { if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
@@ -166,7 +167,6 @@ public class LanLinkProvider extends BaseLinkProvider {
Log.i("KDE/LanLinkProvider", "Identity package received from a stablished TCP connection from " + np.getString("deviceName")); Log.i("KDE/LanLinkProvider", "Identity package received from a stablished TCP connection from " + np.getString("deviceName"));
final Channel channel = ctx.channel();
final LanLink.ConnectionStarted connectionStarted = LanLink.ConnectionStarted.Locally; final LanLink.ConnectionStarted connectionStarted = LanLink.ConnectionStarted.Locally;
// Add ssl handler if device uses new protocol // Add ssl handler if device uses new protocol
@@ -175,7 +175,7 @@ public class LanLinkProvider extends BaseLinkProvider {
final SSLEngine sslEngine = SslHelper.getSslEngine(context, np.getString("deviceId"), SslHelper.SslMode.Client); final SSLEngine sslEngine = SslHelper.getSslEngine(context, np.getString("deviceId"), SslHelper.SslMode.Client);
SslHandler sslHandler = new SslHandler(sslEngine); SslHandler sslHandler = new SslHandler(sslEngine);
ctx.channel().pipeline().addFirst(sslHandler); channel.pipeline().addFirst(sslHandler);
sslHandler.handshakeFuture().addListener(new GenericFutureListener<Future<? super Channel>>() { sslHandler.handshakeFuture().addListener(new GenericFutureListener<Future<? super Channel>>() {
@Override @Override
public void operationComplete(Future<? super Channel> future) throws Exception { public void operationComplete(Future<? super Channel> future) throws Exception {
@@ -210,11 +210,11 @@ public class LanLinkProvider extends BaseLinkProvider {
} }
} else { } else {
LanLink prevLink = nioLinks.get(ctx.channel().hashCode()); LanLink link = nioLinks.get(channel.hashCode());
if (prevLink == null) { if (link== null) {
Log.e("KDE/LanLinkProvider","Expecting an identity package (A)"); Log.e("KDE/LanLinkProvider","Expecting an identity package instead of " + np.getType());
} else { } else {
prevLink.injectNetworkPackage(np); link.injectNetworkPackage(np);
} }
} }
@@ -233,7 +233,7 @@ public class LanLinkProvider extends BaseLinkProvider {
final String deviceId = identityPackage.getString("deviceId"); final String deviceId = identityPackage.getString("deviceId");
if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) { if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
Log.e("KDE/LanLinkProvider", "Expecting an identity package (B)"); Log.e("KDE/LanLinkProvider", "Expecting an UDP identity package");
return; return;
} else { } else {
String myId = DeviceHelper.getDeviceId(context); String myId = DeviceHelper.getDeviceId(context);