Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more refactoring -- limit NetUtils method to network stuff as much as

Browse source 
possible.
This commit is contained in:
Andy2 2011-08-11 06:40:13 -07:00
parent 008c70957a
commit 985f254660
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,10 +120,10 @@ public class NetUtils {
}
}
public static String[] queryRelay( Context context, String[] ids,
int nBytes )
public static byte[][][] queryRelay( Context context, String[] ids,
int nBytes )
{
String[] result = null;
byte[][][] msgs = null;
try {
Socket socket = MakeProxySocket( context, 8000 );
DataOutputStream outStream =
@ -148,7 +148,7 @@ public class NetUtils {
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 ) {
@ -168,25 +168,6 @@ public class NetUtils {
}
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 ) {
@ -194,7 +175,7 @@ public class NetUtils {
} catch( NullPointerException npe ) {
Utils.logf( npe.toString() );
}
return result;
return msgs;
} // queryRelay
}

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

@ -51,12 +51,31 @@ public class RelayService extends Service {
int[] nBytes = new int[1];
String[] ids = collectIDs( nBytes );
if ( null != ids && 0 < ids.length ) {
String[] relayIDs =
byte[][][] msgs =
NetUtils.queryRelay( RelayService.this,
ids, nBytes[0] );
if ( null != relayIDs ) {
if ( !DispatchNotify.tryHandle( relayIDs ) ) {
setupNotification( relayIDs );
int nameCount = ids.length;
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( RelayService.this,
ids[ii],
msgs[ii] ) ) {
idsWMsgs.add( ids[ii] );
}
}
}
if ( 0 < idsWMsgs.size() ) {
String[] relayIDs = new String[idsWMsgs.size()];
idsWMsgs.toArray( relayIDs );
if ( !DispatchNotify.tryHandle( relayIDs ) ) {
setupNotification( relayIDs );
}
}
}
}