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

clear game-launched flag in onNewIntent so that one game can replace

Browse source 
another via a Notification- or other-sourced Intent
This commit is contained in:
Eric House 2013-05-23 07:51:03 -07:00
parent 6c7cf1fa97
commit f4c18a78ac
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -385,6 +385,7 @@ public class GamesList extends XWExpandableListActivity
protected void onNewIntent( Intent intent )
{
super.onNewIntent( intent );
m_gameLaunched = false;
Assert.assertNotNull( intent );
invalRelayIDs( intent.getStringArrayExtra( RELAYIDS_EXTRA ) );
startFirstHasDict( intent );
@ -487,21 +488,23 @@ public class GamesList extends XWExpandableListActivity
// We need a way to let the user get back to the basic-config
// dialog in case it was dismissed. That way it to check for
// an empty room name.
if ( summary.conType == CommsAddrRec.CommsConnType.COMMS_CONN_RELAY
&& summary.roomName.length() == 0 ) {
// If it's unconfigured and of the type RelayGameActivity
// can handle send it there, otherwise use the full-on
// config.
Class clazz;
if ( RelayGameActivity.isSimpleGame( summary ) ) {
clazz = RelayGameActivity.class;
if ( !m_gameLaunched ) {
if ( summary.conType == CommsAddrRec.CommsConnType.COMMS_CONN_RELAY
&& summary.roomName.length() == 0 ) {
// If it's unconfigured and of the type RelayGameActivity
// can handle send it there, otherwise use the full-on
// config.
Class clazz;
if ( RelayGameActivity.isSimpleGame( summary ) ) {
clazz = RelayGameActivity.class;
} else {
clazz = GameConfig.class;
}
GameUtils.doConfig( this, rowid, clazz );
} else {
clazz = GameConfig.class;
}
GameUtils.doConfig( this, rowid, clazz );
} else {
if ( checkWarnNoDict( rowid ) ) {
launchGame( rowid );
if ( checkWarnNoDict( rowid ) ) {
launchGame( rowid );
}
}
}
}