Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't assert when don't have expected connType (likely as result of

Browse source 
race condition.  Just don't show the type in summary.  Likely fixes
once-seen assertion failure.
This commit is contained in:
Eric House 2012-01-17 18:48:33 -08:00
parent 7a90f71d41
commit 00575c6d4e
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/GameSummary.java
View file

@ -146,19 +146,19 @@ public class GameSummary {
String result = null;
if ( isRelayGame() ) {
Assert.assertTrue( CommsAddrRec.CommsConnType.COMMS_CONN_RELAY
== conType );
int fmtID;
if ( null == relayID || 0 == relayID.length() ) {
fmtID = R.string.summary_relay_conff;
} else if ( anyMissing() ) {
fmtID = R.string.summary_relay_waitf;
} else if ( gameOver ) {
fmtID = R.string.summary_relay_gameoverf;
} else {
fmtID = R.string.summary_relay_connf;
if ( CommsAddrRec.CommsConnType.COMMS_CONN_RELAY == conType ) {
int fmtID;
if ( null == relayID || 0 == relayID.length() ) {
fmtID = R.string.summary_relay_conff;
} else if ( anyMissing() ) {
fmtID = R.string.summary_relay_waitf;
} else if ( gameOver ) {
fmtID = R.string.summary_relay_gameoverf;
} else {
fmtID = R.string.summary_relay_connf;
}
result = String.format( m_context.getString(fmtID), roomName );
}
result = String.format( m_context.getString(fmtID), roomName );
}
return result;
}