Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor -- no behavior change

Browse source
This commit is contained in:
Andy2 2011-08-11 06:29:21 -07:00
parent c2ae80cf37
commit 008c70957a
2 changed files with 91 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
View file

@ -120,96 +120,81 @@ public class NetUtils {
}
}
public static String[] QueryRelay( Context context )
public static String[] queryRelay( Context context, String[] ids,
int nBytes )
{
String[] result = null;
int[] nBytes = new int[1];
String[] ids = collectIDs( context, nBytes );
if ( null != ids && 0 < ids.length ) {
try {
Socket socket = MakeProxySocket( context, 8000 );
DataOutputStream outStream =
new DataOutputStream( socket.getOutputStream() );
try {
Socket socket = MakeProxySocket( context, 8000 );
DataOutputStream outStream =
new DataOutputStream( socket.getOutputStream() );
// total packet size
outStream.writeShort( 2 + nBytes[0] + ids.length + 1 );
// total packet size
outStream.writeShort( 2 + nBytes + ids.length + 1 );
outStream.writeByte( NetUtils.PROTOCOL_VERSION );
outStream.writeByte( NetUtils.PRX_GET_MSGS );
outStream.writeByte( NetUtils.PROTOCOL_VERSION );
outStream.writeByte( NetUtils.PRX_GET_MSGS );
// number of ids
outStream.writeShort( ids.length );
// number of ids
outStream.writeShort( ids.length );
for ( String id : ids ) {
outStream.writeBytes( id );
outStream.write( '\n' );
}
outStream.flush();
DataInputStream dis =
new DataInputStream(socket.getInputStream());
short resLen = dis.readShort();
short nameCount = dis.readShort();
byte[][][] msgs = null;
if ( nameCount == ids.length ) {
msgs = new byte[nameCount][][];
for ( int ii = 0; ii < nameCount; ++ii ) {
short countsThisGame = dis.readShort();
if ( countsThisGame > 0 ) {
msgs[ii] = new byte[countsThisGame][];
for ( int jj = 0; jj < countsThisGame; ++jj ) {
short len = dis.readShort();
if ( len > 0 ) {
byte[] packet = new byte[len];
dis.read( packet );
msgs[ii][jj] = packet;
}
}
}
}
}
socket.close();
if ( null != msgs ) {
ArrayList<String> idsWMsgs =
new ArrayList<String>( nameCount );
for ( int ii = 0; ii < nameCount; ++ii ) {
// if game has messages, open it and feed 'em
// to it.
if ( null != msgs[ii] ) {
if( GameUtils.feedMessages( context, ids[ii],
msgs[ii] ) ) {
idsWMsgs.add( ids[ii] );
}
}
}
if ( 0 < idsWMsgs.size() ) {
ids = new String[idsWMsgs.size()];
result = idsWMsgs.toArray( ids );
}
}
} catch( java.net.UnknownHostException uhe ) {
Utils.logf( uhe.toString() );
} catch( java.io.IOException ioe ) {
Utils.logf( ioe.toString() );
} catch( NullPointerException npe ) {
Utils.logf( npe.toString() );
for ( String id : ids ) {
outStream.writeBytes( id );
outStream.write( '\n' );
}
outStream.flush();
DataInputStream dis =
new DataInputStream(socket.getInputStream());
short resLen = dis.readShort();
short nameCount = dis.readShort();
byte[][][] msgs = null;
if ( nameCount == ids.length ) {
msgs = new byte[nameCount][][];
for ( int ii = 0; ii < nameCount; ++ii ) {
short countsThisGame = dis.readShort();
if ( countsThisGame > 0 ) {
msgs[ii] = new byte[countsThisGame][];
for ( int jj = 0; jj < countsThisGame; ++jj ) {
short len = dis.readShort();
if ( len > 0 ) {
byte[] packet = new byte[len];
dis.read( packet );
msgs[ii][jj] = packet;
}
}
}
}
}
socket.close();
if ( null != msgs ) {
ArrayList<String> idsWMsgs =
new ArrayList<String>( nameCount );
for ( int ii = 0; ii < nameCount; ++ii ) {
// if game has messages, open it and feed 'em
// to it.
if ( null != msgs[ii] ) {
if( GameUtils.feedMessages( context, ids[ii],
msgs[ii] ) ) {
idsWMsgs.add( ids[ii] );
}
}
}
if ( 0 < idsWMsgs.size() ) {
ids = new String[idsWMsgs.size()];
result = idsWMsgs.toArray( ids );
}
}
} catch( java.net.UnknownHostException uhe ) {
Utils.logf( uhe.toString() );
} catch( java.io.IOException ioe ) {
Utils.logf( ioe.toString() );
} catch( NullPointerException npe ) {
Utils.logf( npe.toString() );
}
return result;
} // QueryRelay
} // queryRelay
private static String[] collectIDs( Context context, int[] nBytes )
{
String[] ids = DBUtils.getRelayIDs( context, false );
int len = 0;
if ( null != ids ) {
for ( String id : ids ) {
len += id.length();
}
}
nBytes[0] = len;
return ids;
}
}

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

@ -48,11 +48,16 @@ public class RelayService extends Service {
Thread thread = new Thread( null, new Runnable() {
public void run() {
String[] relayIDs = NetUtils.QueryRelay( RelayService.this );
if ( null != relayIDs ) {
if ( !DispatchNotify.tryHandle( relayIDs ) ) {
setupNotification( relayIDs );
int[] nBytes = new int[1];
String[] ids = collectIDs( nBytes );
if ( null != ids && 0 < ids.length ) {
String[] relayIDs =
NetUtils.queryRelay( RelayService.this,
ids, nBytes[0] );
if ( null != relayIDs ) {
if ( !DispatchNotify.tryHandle( relayIDs ) ) {
setupNotification( relayIDs );
}
}
}
RelayService.this.stopSelf();
@ -97,4 +102,18 @@ public class RelayService extends Service {
nm.notify( R.string.notify_body, // unique id; any will do
notification );
}
private String[] collectIDs( int[] nBytes )
{
String[] ids = DBUtils.getRelayIDs( this, false );
int len = 0;
if ( null != ids ) {
for ( String id : ids ) {
len += id.length();
}
}
nBytes[0] = len;
return ids;
}
}