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

Some bugs fixed and sockets keepalive enabled

Browse Source
This commit is contained in:
Albert Vaca
2013-07-23 20:22:38 +02:00
parent 91ebceb5ca
commit 43059d0230
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java
View File

@@ -27,8 +27,10 @@ public class TcpComputerLink extends BaseComputerLink {
super(linkProvider); super(linkProvider);
sChannel = SocketChannel.open(); sChannel = SocketChannel.open();
sChannel.connect(new InetSocketAddress(ip, port)); sChannel.socket().setSoTimeout(0);
sChannel.socket().setKeepAlive(true);
sChannel.configureBlocking(false); sChannel.configureBlocking(false);
sChannel.connect(new InetSocketAddress(ip, port));
} }
@@ -112,7 +114,7 @@ public class TcpComputerLink extends BaseComputerLink {
ByteBuffer buffer = ByteBuffer.allocate(4096); ByteBuffer buffer = ByteBuffer.allocate(4096);
int read = sChannel.read(buffer); int read = sChannel.read(buffer);
//TODO: Check if there is more to read (or we have read more than one package) //TODO: Check if there is more to read (or otherwise if we have read more than one package)
String s = new String( buffer.array(), 0, read, charset ); String s = new String( buffer.array(), 0, read, charset );
Log.e("readable","Read "+read+" bytes: "+s); Log.e("readable","Read "+read+" bytes: "+s);

4
KdeConnect/src/main/java/org/kde/connect/LinkProviders/AvahiTcpLinkProvider.java
View File

@@ -71,6 +71,10 @@ public class AvahiTcpLinkProvider implements BaseLinkProvider {
link.setDeviceId(id); link.setDeviceId(id);
link.sendPackage(NetworkPackage.createIdentityPackage(ctx)); link.sendPackage(NetworkPackage.createIdentityPackage(ctx));
if (visibleComputers.containsKey(host)) {
//Remove old connection to same host, probably down
cr.onConnectionLost(visibleComputers.get(host));
}
visibleComputers.put(host,link); visibleComputers.put(host,link);
cr.onConnectionAccepted(id,name,link); cr.onConnectionAccepted(id,name,link);

1
KdeConnect/src/main/java/org/kde/connect/PackageInterfaces/ClipboardPackageInterface.java
View File

@@ -43,5 +43,4 @@ public class ClipboardPackageInterface extends BasePackageInterface {
cm.setText(np.getString("content")); cm.setText(np.getString("content"));
} }
} }
} }

11
KdeConnect/src/main/res/layout/activity_main.xml
View File

@@ -17,6 +17,15 @@
<ListView <ListView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/listView1"/> android:id="@+id/listView1"
android:layout_weight="1"/>
<EditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/editText"
android:layout_gravity="left|center_vertical"
android:layout_weight="1"
android:text="I'm a test text field"/>
</LinearLayout> </LinearLayout>