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

save changes to address list

Browse source
This commit is contained in:
Eric House 2014-09-25 07:06:33 -07:00
parent 2beb897b2c
commit e0eb22854f
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
View file

@ -402,10 +402,8 @@ public class BTService extends XWService {
DataInputStream inStream = null;
int nRead = 0;
try {
DbgUtils.logf( "run: calling accept()" );
socket = m_serverSocket.accept(); // blocks
addAddr( socket );
DbgUtils.logf( "run: accept() returned" );
inStream = new DataInputStream( socket.getInputStream() );
byte proto = inStream.readByte();
@ -506,7 +504,7 @@ public class BTService extends XWService {
os.flush();
socket.close();
DbgUtils.logf( "receiveInvitation done", gameID );
// DbgUtils.logf( "receiveInvitation done", gameID );
} // receiveInvitation
private void receiveMessage( DataInputStream dis, BluetoothSocket socket )
@ -520,10 +518,6 @@ public class BTService extends XWService {
BluetoothDevice host = socket.getRemoteDevice();
addAddr( host );
DbgUtils.logf( "receiveMessages: got %d bytes from %s for "
+ "gameID of %d",
len, host.getName(), gameID );
// check if still here
long[] rowids = DBUtils.getRowIDsFor( BTService.this,
gameID );
@ -606,6 +600,7 @@ public class BTService extends XWService {
}
}
}
saveAddrs();
}
private String nameForAddr( String btAddr )
@ -640,14 +635,14 @@ public class BTService extends XWService {
try {
elem = m_queue.poll( timeout, TimeUnit.SECONDS );
} catch ( InterruptedException ie ) {
DbgUtils.logf( "interrupted; killing thread" );
DbgUtils.logf( "BTService: interrupted; killing thread" );
break;
}
if ( null == elem ) {
doAnyResends();
} else {
DbgUtils.logf( "run: got %s from queue", elem.m_cmd.toString() );
// DbgUtils.logf( "run: got %s from queue", elem.m_cmd.toString() );
switch( elem.m_cmd ) {
case PING:
@ -684,7 +679,7 @@ public class BTService extends XWService {
private void sendPings( MultiEvent event )
{
Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
// DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
for ( BluetoothDevice dev : pairedDevs ) {
String btAddr = dev.getAddress();
if ( haveAddr( btAddr ) ) {
@ -706,8 +701,6 @@ public class BTService extends XWService {
boolean sendWorking = false;
boolean receiveWorking = false;
try {
DbgUtils.logf( "PingThread: got socket to device %s",
dev.getName() );
BluetoothSocket socket =
dev.createRfcommSocketToServiceRecord( XWApp.getAppUUID() );
if ( null != socket ) {
@ -800,7 +793,7 @@ public class BTService extends XWService {
MultiEvent evt;
if ( success ) {
evt = MultiEvent.MESSAGE_DROPPED;
DbgUtils.logf( "dropping message %s because game %X dead",
DbgUtils.logf( "BTService.sendMsg: dropping message %s because game %X dead",
elem.m_cmd, elem.m_gameID );
} else {
evt = MultiEvent.MESSAGE_REFUSED;