Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

always remove dialog state so we don't get confused

Browse source
This commit is contained in:
Eric House 2013-01-29 21:59:42 -08:00
parent 0dc3856250
commit 5e7fd39d66
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -128,6 +128,11 @@ public class DlgDelegate {
return dialog;
}
public void showOKOnlyDialog( String msg )
{
showOKOnlyDialog( msg, SKIP_CALLBACK );
}
public void showOKOnlyDialog( String msg, int callbackID )
{
// Assert.assertNull( m_dlgStates );
@ -143,7 +148,7 @@ public class DlgDelegate {
public void showOKOnlyDialog( int msgID )
{
showOKOnlyDialog( m_activity.getString( msgID ), 0 );
showOKOnlyDialog( m_activity.getString( msgID ), SKIP_CALLBACK );
}
public void showDictGoneFinish()
@ -282,7 +287,7 @@ public class DlgDelegate {
post( new Runnable() {
public void run() {
if ( asDlg ) {
showOKOnlyDialog( fmsg, 0 );
showOKOnlyDialog( fmsg, SKIP_CALLBACK );
} else {
DbgUtils.showf( m_activity, fmsg );
}
@ -330,9 +335,8 @@ public class DlgDelegate {
.setMessage( state.m_msg )
.setPositiveButton( R.string.button_ok, null )
.create();
if ( 0 != state.m_cbckID ) {
dialog = setCallbackDismissListener( dialog, state, id );
}
dialog = setCallbackDismissListener( dialog, state, id );
return dialog;
}
@ -485,11 +489,12 @@ public class DlgDelegate {
private void dropState( DlgState state )
{
int nDlgs = m_dlgStates.size();
Assert.assertNotNull( state );
Assert.assertTrue( state == m_dlgStates.get( state.m_id ) );
m_dlgStates.remove( state.m_id );
DbgUtils.logf( "dropState: there are now %d active dialogs",
m_dlgStates.size() );
DbgUtils.logf( "dropState: active dialogs now %d from %d ",
m_dlgStates.size(), nDlgs );
}
private void addState( DlgState state )

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

@ -126,7 +126,7 @@ public class XWActivity extends Activity
protected void showOKOnlyDialog( String msg )
{
m_delegate.showOKOnlyDialog( msg, 0 );
m_delegate.showOKOnlyDialog( msg );
}
protected void showDictGoneFinish()

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWExpandableListActivity.java
View file

@ -51,7 +51,6 @@ public class XWExpandableListActivity extends ExpandableListActivity
@Override
protected Dialog onCreateDialog( final int id )
{
DbgUtils.logf( "%s.onCreateDialog() called", getClass().getName() );
Dialog dialog = m_delegate.onCreateDialog( id );
if ( null == dialog ) {
dialog = super.onCreateDialog( id );

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

@ -116,7 +116,7 @@ public class XWListActivity extends ListActivity
protected void showOKOnlyDialog( String msg )
{
m_delegate.showOKOnlyDialog( msg, 0 );
m_delegate.showOKOnlyDialog( msg );
}
protected void showOKOnlyDialog( int msgID )