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

remove assert that was there just to prove a fix; use %b in logging.

Browse source
This commit is contained in:
Andy2 2011-07-22 10:55:03 -07:00
parent 3563ca5855
commit acafc0a2df
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -352,7 +352,10 @@ public class BoardActivity extends XWActivity
{ {
super.onResume(); super.onResume();
m_handler = new Handler(); m_handler = new Handler();
m_blockingDlgPosted = false;
setKeepScreenOn(); setKeepScreenOn();
loadGame(); loadGame();
} }
@ -780,7 +783,7 @@ public class BoardActivity extends XWActivity
public void setIsServer( boolean isServer ) public void setIsServer( boolean isServer )
{ {
Utils.logf( "setIsServer(%s)", isServer?"true":"false" ); Utils.logf( "setIsServer(%b)", isServer );
DeviceRole newRole = isServer? DeviceRole.SERVER_ISSERVER DeviceRole newRole = isServer? DeviceRole.SERVER_ISSERVER
: DeviceRole.SERVER_ISCLIENT; : DeviceRole.SERVER_ISCLIENT;
if ( newRole != m_gi.serverRole ) { if ( newRole != m_gi.serverRole ) {
@ -1050,9 +1053,6 @@ public class BoardActivity extends XWActivity
private void loadGame() private void loadGame()
{ {
Assert.assertFalse( m_blockingDlgPosted ); // found the problem!
m_blockingDlgPosted = false;
if ( 0 == m_jniGamePtr ) { if ( 0 == m_jniGamePtr ) {
Assert.assertNull( m_gameLock ); Assert.assertNull( m_gameLock );
m_gameLock = new GameUtils.GameLock( m_name, true ).lock(); m_gameLock = new GameUtils.GameLock( m_name, true ).lock();

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -919,8 +919,8 @@ public class GameConfig extends XWActivity
if ( !m_notNetworkedGame ) { if ( !m_notNetworkedGame ) {
m_car.ip_relay_seeksPublicRoom = m_joinPublicCheck.isChecked(); m_car.ip_relay_seeksPublicRoom = m_joinPublicCheck.isChecked();
Utils.logf( "ip_relay_seeksPublicRoom: %s", Utils.logf( "ip_relay_seeksPublicRoom: %b",
m_car.ip_relay_seeksPublicRoom?"true":"false" ); m_car.ip_relay_seeksPublicRoom );
m_car.ip_relay_advertiseRoom = m_car.ip_relay_advertiseRoom =
Utils.getChecked( this, R.id.advertise_new_room_check ); Utils.getChecked( this, R.id.advertise_new_room_check );
if ( m_car.ip_relay_seeksPublicRoom ) { if ( m_car.ip_relay_seeksPublicRoom ) {

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -831,7 +831,7 @@ public class GameUtils {
lock.unlock(); lock.unlock();
} }
} }
Utils.logf( "feedMessages=>%s", draw?"true":"false" ); Utils.logf( "feedMessages=>%b", draw );
return draw; return draw;
} }