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

Be less verbose

Browse Source
This commit is contained in:
Albert Vaca
2016-06-17 02:25:10 +02:00
parent ac4f072322
commit ff47313409
2 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
View File

@@ -46,7 +46,6 @@ import java.nio.channels.NotYetConnectedException;
import java.security.PublicKey; import java.security.PublicKey;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocket;
@@ -66,7 +65,7 @@ public class LanLink extends BaseLink {
@Override @Override
public void disconnect() { public void disconnect() {
Log.e("Disconnect","socket:"+ socket.hashCode()); Log.i("LanLink/Disconnect","socket:"+ socket.hashCode());
if (socket == null) { if (socket == null) {
Log.w("KDE/LanLink", "Not yet connected"); Log.w("KDE/LanLink", "Not yet connected");
@@ -101,36 +100,25 @@ public class LanLink extends BaseLink {
try { try {
BufferedReader reader = new BufferedReader(new InputStreamReader(newSocket.getInputStream(), StringsHelper.UTF8)); BufferedReader reader = new BufferedReader(new InputStreamReader(newSocket.getInputStream(), StringsHelper.UTF8));
while (true) { while (true) {
if (socket.isClosed()) {
Log.e("BufferReader", "Channel closed");
break;
}
String packet; String packet;
try { try {
packet = reader.readLine(); packet = reader.readLine();
} catch (SocketTimeoutException e) { } catch (SocketTimeoutException e) {
Log.w("BufferReader", "timeout");
continue; continue;
} }
if (packet == null) { if (packet == null) {
Log.w("BufferReader", "null package"); throw new IOException("Read null");
break;
}
if (packet.isEmpty()) {
Log.w("BufferReader", "empty package: " + packet);
continue;
} }
if (packet.isEmpty()) continue;
NetworkPackage np = NetworkPackage.unserialize(packet); NetworkPackage np = NetworkPackage.unserialize(packet);
injectNetworkPackage(np); injectNetworkPackage(np);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Log.e("LanLink", "Socket closed " + newSocket.hashCode() + " reason: " + e.getMessage());
}
Log.e("LanLink", "Socket closed"+newSocket.hashCode());
boolean thereIsaANewSocket = (newSocket != socket); boolean thereIsaANewSocket = (newSocket != socket);
linkProvider.socketClosed(newSocket, thereIsaANewSocket); linkProvider.socketClosed(newSocket, thereIsaANewSocket);
} }
}
}).start(); }).start();
return oldSocket; return oldSocket;

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

@@ -114,20 +114,16 @@ public class LanLinkProvider extends BaseLinkProvider {
BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
String message = reader.readLine(); String message = reader.readLine();
networkPackage = NetworkPackage.unserialize(message); networkPackage = NetworkPackage.unserialize(message);
Log.e("TcpListener","Received TCP package: "+networkPackage.serialize()); //Log.i("TcpListener","Received TCP package: "+networkPackage.serialize());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return; return;
} }
if (networkPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) { if (networkPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
//TODO: Don't accept identity packet when already connected (move this if inside the check we do in the else)
Log.i("KDE/LanLinkProvider", "Identity package received from a TCP connection from " + networkPackage.getString("deviceName")); Log.i("KDE/LanLinkProvider", "Identity package received from a TCP connection from " + networkPackage.getString("deviceName"));
identityPackageReceived(networkPackage, socket, LanLink.ConnectionStarted.Locally); identityPackageReceived(networkPackage, socket, LanLink.ConnectionStarted.Locally);
} else { } else {
LanLink link = nioLinks.get(socket); LanLink link = nioLinks.get(socket);
if (link== null) { if (link== null) {
Log.e("KDE/LanLinkProvider","Expecting an identity package instead of " + networkPackage.getType()); Log.e("KDE/LanLinkProvider","Expecting an identity package instead of " + networkPackage.getType());
@@ -276,12 +272,6 @@ public class LanLinkProvider extends BaseLinkProvider {
private void addLink(final NetworkPackage identityPackage, Socket socket, LanLink.ConnectionStarted connectionOrigin) throws IOException { private void addLink(final NetworkPackage identityPackage, Socket socket, LanLink.ConnectionStarted connectionOrigin) throws IOException {
try {
Log.e("addLink", identityPackage.serialize());
} catch (JSONException e) {
e.printStackTrace();
}
String deviceId = identityPackage.getString("deviceId"); String deviceId = identityPackage.getString("deviceId");
LanLink currentLink = visibleComputers.get(deviceId); LanLink currentLink = visibleComputers.get(deviceId);
if (currentLink != null) { if (currentLink != null) {
@@ -298,7 +288,6 @@ public class LanLinkProvider extends BaseLinkProvider {
nioLinks.put(socket, currentLink); nioLinks.put(socket, currentLink);
//Log.e("KDE/LanLinkProvider", "Replacing socket. old: "+ oldSocket.hashCode() + " - new: "+ socket.hashCode()); //Log.e("KDE/LanLinkProvider", "Replacing socket. old: "+ oldSocket.hashCode() + " - new: "+ socket.hashCode());
} else { } else {
Log.e("addLink", "create link");
//Let's create the link //Let's create the link
LanLink link = new LanLink(context, deviceId, this, socket, connectionOrigin); LanLink link = new LanLink(context, deviceId, this, socket, connectionOrigin);
nioLinks.put(socket, link); nioLinks.put(socket, link);
@@ -349,9 +338,7 @@ public class LanLinkProvider extends BaseLinkProvider {
public void run() { public void run() {
while (running) { while (running) {
try { try {
Log.e("ServerSocket","Waiting...");
Socket socket = tcpServer.accept(); Socket socket = tcpServer.accept();
Log.e("ServerSocket","Got a socket!");
configureSocket(socket); configureSocket(socket);
tcpPackageReceived(socket); tcpPackageReceived(socket);
} catch (Exception e) { } catch (Exception e) {
@@ -401,8 +388,8 @@ public class LanLinkProvider extends BaseLinkProvider {
try { try {
InetAddress client = InetAddress.getByName(ipstr); InetAddress client = InetAddress.getByName(ipstr);
socket.send(new DatagramPacket(bytes, bytes.length, client, port)); socket.send(new DatagramPacket(bytes, bytes.length, client, port));
//socket.send(new DatagramPacket(bytes, bytes.length, client, oldPort)); socket.send(new DatagramPacket(bytes, bytes.length, client, oldPort));
Log.i("KDE/LanLinkProvider","Udp identity package sent to address "+client); //Log.i("KDE/LanLinkProvider","Udp identity package sent to address "+client);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
Log.e("KDE/LanLinkProvider", "Sending udp identity package failed. Invalid address? (" + ipstr + ")"); Log.e("KDE/LanLinkProvider", "Sending udp identity package failed. Invalid address? (" + ipstr + ")");