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

deal with null socket (e.g. if in airplane mode); deal with new public

Browse source 
rooms format.
This commit is contained in:
Andy2 2010-10-17 20:18:24 -07:00
parent 1621e5932a
commit 5c958eaadb
1 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java
View file

@ -70,39 +70,41 @@ public class RefreshNamesTask extends AsyncTask<Void, Void, String[]> {
try {
Socket socket = NetUtils.MakeProxySocket( m_context, 15000 );
DataOutputStream outStream =
new DataOutputStream( socket.getOutputStream() );
if ( null != socket ) {
DataOutputStream outStream =
new DataOutputStream( socket.getOutputStream() );
outStream.writeShort( 4 ); // total packet length
outStream.writeByte( NetUtils.PROTOCOL_VERSION );
outStream.writeByte( NetUtils.PRX_PUB_ROOMS );
outStream.writeByte( (byte)m_lang );
outStream.writeByte( (byte)m_nInGame );
outStream.flush();
outStream.writeShort( 4 ); // total packet length
outStream.writeByte( NetUtils.PROTOCOL_VERSION );
outStream.writeByte( NetUtils.PRX_PUB_ROOMS );
outStream.writeByte( (byte)m_lang );
outStream.writeByte( (byte)m_nInGame );
outStream.flush();
// read result -- will block
DataInputStream dis =
new DataInputStream(socket.getInputStream());
short len = dis.readShort();
short nRooms = dis.readShort();
Utils.logf( "%s: got %d rooms", "doInBackground", nRooms );
// read result -- will block
DataInputStream dis =
new DataInputStream(socket.getInputStream());
short len = dis.readShort();
short nRooms = dis.readShort();
Utils.logf( "%s: got %d rooms", "doInBackground", nRooms );
// Can't figure out how to read a null-terminated string
// from DataInputStream so parse it myself.
byte[] bytes = new byte[len];
dis.read( bytes );
// Can't figure out how to read a null-terminated string
// from DataInputStream so parse it myself.
byte[] bytes = new byte[len];
dis.read( bytes );
int index = -1;
for ( int ii = 0; ii < nRooms; ++ii ) {
int lastIndex = ++index; // skip the null
while ( bytes[index] != '\n' ) {
++index;
int index = -1;
for ( int ii = 0; ii < nRooms; ++ii ) {
int lastIndex = ++index; // skip the null
while ( bytes[index] != '\n' ) {
++index;
}
String name = new String( bytes, lastIndex, index - lastIndex );
Utils.logf( "got public room name: %s", name );
int indx = name.lastIndexOf( "/" );
indx = name.lastIndexOf( "/", indx-1 );
names.add( name.substring(0, indx ) );
}
String name = new String( bytes, lastIndex, index - lastIndex );
Utils.logf( "got public room name: %s", name );
int indx = name.lastIndexOf("/");
names.add( name.substring(0, indx ) );
}
} catch ( java.io.IOException ioe ) {
Utils.logf( "%s", ioe.toString() );