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

handle alert command by posting message (if app's in foreground;

Browse source 
should otherwise post an intent...); remove some of excessive logging
This commit is contained in:
Eric House 2013-08-18 20:13:08 -07:00
parent 5412119a6f
commit 31a3a593a4
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
View file

@ -94,7 +94,7 @@ public class RelayService extends XWService
// Must be kept in sync with eponymous enum in xwrelay.h // Must be kept in sync with eponymous enum in xwrelay.h
private enum XWRelayReg { private enum XWRelayReg {
XWPDEV_NONE XWPDEV_NONE
,XWPDEV_ALERT ,XWPDEV_UNAVAIL
,XWPDEV_REG ,XWPDEV_REG
,XWPDEV_REGRSP ,XWPDEV_REGRSP
,XWPDEV_KEEPALIVE ,XWPDEV_KEEPALIVE
@ -105,6 +105,8 @@ public class RelayService extends XWService
,XWPDEV_MSGRSP ,XWPDEV_MSGRSP
,XWPDEV_BADREG ,XWPDEV_BADREG
,XWPDEV_ACK ,XWPDEV_ACK
,XWPDEV_DELGAME
,XWPDEV_ALERT
}; };
public static void gcmConfirmed( boolean confirmed ) public static void gcmConfirmed( boolean confirmed )
@ -351,18 +353,12 @@ public class RelayService extends XWService
DatagramPacket packet = DatagramPacket packet =
new DatagramPacket( buf, buf.length ); new DatagramPacket( buf, buf.length );
try { try {
DbgUtils.logf( "UPD read thread blocking "
+ "on receive" );
m_UDPSocket.receive( packet ); m_UDPSocket.receive( packet );
resetExitTimer(); resetExitTimer();
DbgUtils.logf( "UPD read thread: "
+ "receive returned" );
} catch( java.io.IOException ioe ) { } catch( java.io.IOException ioe ) {
DbgUtils.loge( ioe ); DbgUtils.loge( ioe );
break; // ??? break; // ???
} }
DbgUtils.logf( "received %d bytes",
packet.getLength() );
gotPacket( packet ); gotPacket( packet );
} }
DbgUtils.logf( "read thread exiting" ); DbgUtils.logf( "read thread exiting" );
@ -489,10 +485,17 @@ public class RelayService extends XWService
sendAckIf( header ); sendAckIf( header );
DbgUtils.logf( "gotPacket: cmd=%s", header.m_cmd.toString() ); DbgUtils.logf( "gotPacket: cmd=%s", header.m_cmd.toString() );
switch ( header.m_cmd ) { switch ( header.m_cmd ) {
case XWPDEV_ALERT: case XWPDEV_UNAVAIL:
int unavail = dis.readInt();
DbgUtils.logf( "relay unvailable for another %d seconds",
unavail );
String str = getStringWithLength( dis ); String str = getStringWithLength( dis );
sendResult( MultiEvent.RELAY_ALERT, str ); sendResult( MultiEvent.RELAY_ALERT, str );
break; break;
case XWPDEV_ALERT:
str = getStringWithLength( dis );
sendResult( MultiEvent.RELAY_ALERT, str );
break;
case XWPDEV_BADREG: case XWPDEV_BADREG:
str = getStringWithLength( dis ); str = getStringWithLength( dis );
DbgUtils.logf( "bad relayID \"%s\" reported", str ); DbgUtils.logf( "bad relayID \"%s\" reported", str );
@ -552,7 +555,6 @@ public class RelayService extends XWService
private void requestMessagesImpl( XWRelayReg reg ) private void requestMessagesImpl( XWRelayReg reg )
{ {
DbgUtils.logf( "requestMessagesImpl" );
ByteArrayOutputStream bas = new ByteArrayOutputStream(); ByteArrayOutputStream bas = new ByteArrayOutputStream();
try { try {
DataOutputStream out = addProtoAndCmd( bas, reg ); DataOutputStream out = addProtoAndCmd( bas, reg );
@ -609,7 +611,7 @@ public class RelayService extends XWService
private void sendAckIf( PacketHeader header ) private void sendAckIf( PacketHeader header )
{ {
DbgUtils.logf( "sendAckIf" ); DbgUtils.logf( "sendAckIf" );
if ( XWRelayReg.XWPDEV_ACK != header.m_cmd ) { if ( 0 != header.m_packetID ) {
ByteArrayOutputStream bas = new ByteArrayOutputStream(); ByteArrayOutputStream bas = new ByteArrayOutputStream();
try { try {
DataOutputStream out = DataOutputStream out =
@ -629,14 +631,15 @@ public class RelayService extends XWService
byte proto = dis.readByte(); byte proto = dis.readByte();
if ( XWPDEV_PROTO_VERSION == proto ) { if ( XWPDEV_PROTO_VERSION == proto ) {
int packetID = dis.readInt(); int packetID = dis.readInt();
DbgUtils.logf( "readHeader: got packetID %d", packetID ); if ( 0 != packetID ) {
DbgUtils.logf( "readHeader: got packetID %d", packetID );
}
byte ordinal = dis.readByte(); byte ordinal = dis.readByte();
XWRelayReg cmd = XWRelayReg.values()[ordinal]; XWRelayReg cmd = XWRelayReg.values()[ordinal];
result = new PacketHeader( cmd, packetID ); result = new PacketHeader( cmd, packetID );
} else { } else {
DbgUtils.logf( "bad proto: %d", proto ); DbgUtils.logf( "bad proto: %d", proto );
} }
DbgUtils.logf( "readHeader => %H", result );
return result; return result;
} }
@ -646,7 +649,8 @@ public class RelayService extends XWService
short len = dis.readShort(); short len = dis.readShort();
byte[] tmp = new byte[len]; byte[] tmp = new byte[len];
dis.read( tmp ); dis.read( tmp );
return new String( tmp ); String result = new String( tmp );
return result;
} }
private DataOutputStream addProtoAndCmd( ByteArrayOutputStream bas, private DataOutputStream addProtoAndCmd( ByteArrayOutputStream bas,
@ -890,11 +894,10 @@ public class RelayService extends XWService
int nextPacketID = 0; int nextPacketID = 0;
synchronized( s_packetsSent ) { synchronized( s_packetsSent ) {
if ( XWRelayReg.XWPDEV_ACK != cmd ) { if ( XWRelayReg.XWPDEV_ACK != cmd ) {
nextPacketID = s_nextPacketID++; nextPacketID = ++s_nextPacketID;
s_packetsSent.add( nextPacketID ); s_packetsSent.add( nextPacketID );
} }
} }
DbgUtils.logf( "nextPacketID(%s)=>%d", cmd.toString(), nextPacketID );
return nextPacketID; return nextPacketID;
} }
@ -972,7 +975,6 @@ public class RelayService extends XWService
public int m_packetID; public int m_packetID;
public XWRelayReg m_cmd; public XWRelayReg m_cmd;
public PacketHeader( XWRelayReg cmd, int packetID ) { public PacketHeader( XWRelayReg cmd, int packetID ) {
DbgUtils.logf( "in PacketHeader contructor" );
m_packetID = packetID; m_packetID = packetID;
m_cmd = cmd; m_cmd = cmd;
} }