Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

assert that we don't use an unprepared menu.

Browse source
This commit is contained in:
Eric House 2013-10-21 20:44:47 -07:00
parent bd902bfc12
commit 1bb0c49c71
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,6 +129,7 @@ public class GamesList extends XWExpandableListActivity
private NetLaunchInfo m_netLaunchInfo;
private GameNamer m_namer;
private boolean m_gameLaunched = false;
private boolean m_menuPrepared;
private HashSet<Long> m_selectedGames;
private HashSet<Integer> m_selectedGroups;
@ -617,14 +618,10 @@ public class GamesList extends XWExpandableListActivity
@Override
public boolean onPrepareOptionsMenu( Menu menu )
{
boolean show;
int nGamesSelected = m_selectedGames.size();
int nGroupsSelected = m_selectedGroups.size();
if ( 0 < nGamesSelected && 0 < nGroupsSelected ) {
DbgUtils.logf( "onPrepareOptionsMenu: incomplete so bailing" );
show = false;
} else {
m_menuPrepared = 0 == nGamesSelected || 0 == nGroupsSelected;
if ( m_menuPrepared ) {
boolean nothingSelected = 0 == (nGroupsSelected + nGamesSelected);
boolean visible = XWPrefs.getDebugEnabled( this );
@ -681,13 +678,17 @@ public class GamesList extends XWExpandableListActivity
Utils.setItemVisible( menu, R.id.list_item_move, 1 == nGamesSelected );
Utils.setItemVisible( menu, R.id.list_item_reset, 1 == nGamesSelected );
show = super.onPrepareOptionsMenu( menu );
m_menuPrepared = super.onPrepareOptionsMenu( menu );
} else {
DbgUtils.logf( "onPrepareOptionsMenu: incomplete so bailing" );
}
return show;
return m_menuPrepared;
}
public boolean onOptionsItemSelected( MenuItem item )
{
Assert.assertTrue( m_menuPrepared );
boolean handled = true;
int groupPos = getSelGroupPos();
long groupID = -1;