Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

use AutoCloseable rather than a hack of my own

Browse source
This commit is contained in:
Eric House 2018-12-11 15:14:51 -08:00
parent f7258f29e8
commit c2f5949623
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
View file

@ -1076,22 +1076,20 @@ public class BTService extends XWService {
if ( null != os ) {
os.writeInt( gameID );
os.flush();
Thread killer = killSocketIn( socket, 5 );
DataInputStream is =
new DataInputStream( socket.getInputStream() );
BTCmd reply = BTCmd.values()[is.readByte()];
if ( BTCmd.BAD_PROTO == reply ) {
sendBadProto( socket );
} else {
gotReply = BTCmd.PONG == reply;
if ( gotReply && is.readBoolean() ) {
mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
try ( KillerIn killer = new KillerIn( socket, 5 ) ) {
DataInputStream is =
new DataInputStream( socket.getInputStream() );
BTCmd reply = BTCmd.values()[is.readByte()];
if ( BTCmd.BAD_PROTO == reply ) {
sendBadProto( socket );
} else {
gotReply = BTCmd.PONG == reply;
if ( gotReply && is.readBoolean() ) {
mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
}
}
}
receiveWorking = true;
killer.interrupt();
sendWorking = true;
}
socket.close();
@ -1210,12 +1208,13 @@ public class BTService extends XWService {
}
outStream.flush();
Thread killer = killSocketIn( socket );
DataInputStream inStream =
new DataInputStream( socket.getInputStream() );
BTCmd reply = BTCmd.values()[inStream.readByte()];
killer.interrupt();
BTCmd reply;
try ( KillerIn killer = new KillerIn( socket, 10 ) ) {
DataInputStream inStream =
new DataInputStream( socket.getInputStream() );
reply = BTCmd.values()[inStream.readByte()];
}
success = true;
switch ( reply ) {
@ -1466,21 +1465,16 @@ public class BTService extends XWService {
.updateStatusIn( this, null, CommsConnType.COMMS_CONN_BT, success );
}
private Thread killSocketIn( final BluetoothSocket socket )
{
return killSocketIn( socket, 10 );
}
private Thread killSocketIn( final BluetoothSocket socket, int seconds )
{
final int millis = seconds * 1000;
Thread thread = new Thread( new Runnable() {
private class KillerIn implements AutoCloseable {
private final Thread mThread;
KillerIn( final BluetoothSocket socket, final int seconds )
{
mThread = new Thread( new Runnable() {
public void run() {
try {
Thread.sleep( millis );
Thread.sleep( 1000 * seconds );
} catch ( InterruptedException ie ) {
Log.w( TAG, "killSocketIn: killed by owner" );
return;
Log.w( TAG, "KillerIn: killed by owner" );
}
try {
socket.close();
@ -1488,9 +1482,15 @@ public class BTService extends XWService {
Log.ex( TAG, ioe );
}
}
} );
thread.start();
return thread;
});
mThread.start();
}
@Override
public void close()
{
mThread.interrupt();
}
}
private class BTMsgSink extends MultiMsgSink {