Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-09 22:00:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

add asserts to catch non-web holdouts; don't crash

Browse source 
Getting nulls when e.g. the relay isn't up. Shouldn't crash in that
case.
This commit is contained in:
Eric House 2017-11-11 15:31:36 -08:00
parent bd4ddb0adf
commit 3da5f237c6
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
View file

@ -110,13 +110,17 @@ public class NetUtils {
params.put( one );
}
HttpURLConnection conn = makeHttpRelayConn( m_context, "kill" );
Log.d( TAG, "kill params: %s", params.toString() );
Log.d( TAG, "runViaWeb(): kill params: %s", params.toString() );
String resStr = runConn( conn, params );
Log.d( TAG, "kill => %s", resStr );
Log.d( TAG, "runViaWeb(): kill => %s", resStr );
JSONObject result = new JSONObject( resStr );
if ( 0 == result.optInt( "err", -1 ) ) {
DBUtils.clearObits( m_context, m_obits );
if ( null != resStr ) {
JSONObject result = new JSONObject( resStr );
if ( 0 == result.optInt( "err", -1 ) ) {
DBUtils.clearObits( m_context, m_obits );
}
} else {
Log.e( TAG, "runViaWeb(): KILL => null" );
}
} catch ( JSONException ex ) {
Assert.assertFalse( BuildConfig.DEBUG );

31
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
View file

@ -668,16 +668,25 @@ public class RelayService extends XWService
HttpURLConnection conn = NetUtils.makeHttpRelayConn( this, "post" );
String result = NetUtils.runConn(conn, params);
JSONObject resultObj = new JSONObject( result );
JSONArray resData = resultObj.getJSONArray( "data" );
Log.d( TAG, "sendViaWeb(): got %d replies", resData.length() );
if ( null != result ) {
Log.d( TAG, "sendViaWeb(): POST => %s", result );
JSONObject resultObj = new JSONObject( result );
JSONArray resData = resultObj.getJSONArray( "data" );
int nReplies = resData.length();
Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
noteSent( packets ); // before we process the acks below :-)
noteSent( packets ); // before we process the acks below :-)
for ( int ii = 0; ii < resData.length(); ++ii ) {
byte[] datum = Utils.base64Decode( resData.getString( ii ) );
// PENDING: skip ack or not
gotPacket( datum, false );
if ( nReplies > 0 ) {
resetExitTimer();
}
for ( int ii = 0; ii < nReplies; ++ii ) {
byte[] datum = Utils.base64Decode( resData.getString( ii ) );
// PENDING: skip ack or not
gotPacket( datum, false );
}
} else {
Log.e( TAG, "sendViaWeb(): failed result for POST" );
}
} catch ( JSONException ex ) {
Assert.assertFalse( BuildConfig.DEBUG );
@ -694,6 +703,9 @@ public class RelayService extends XWService
try {
DatagramPacket udpPacket = new DatagramPacket( data, data.length );
m_UDPSocket.send( udpPacket );
if ( BuildConfig.DEBUG ) {
Assert.assertFalse( XWPrefs.getPreferWebAPI( this ) );
}
sentLen += udpPacket.getLength();
noteSent( packet );
getOut = false;
@ -1158,6 +1170,7 @@ public class RelayService extends XWService
@Override
protected Void doInBackground( Void... ignored )
{
Assert.assertFalse( XWPrefs.getPreferWebAPI( m_context ) );
// format: total msg lenth: 2
// number-of-relayIDs: 2
// for-each-relayid: relayid + '\n': varies
@ -1205,6 +1218,8 @@ public class RelayService extends XWService
}
// Now open a real socket, write size and proto, and
// copy in the formatted buffer
Assert.assertFalse( XWPrefs.getPreferWebAPI( m_context ) );
Socket socket = NetUtils.makeProxySocket( m_context, 8000 );
if ( null != socket ) {
DataOutputStream outStream =