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

always remove dialog on dismissal since each must have its on-dismiss

Browse source 
handler called with its own state.  Fixes assertion failure that was
happening the second time a dialog was used.  Next: find a
reproducible case where two dialogs want to be created at the same
time.
This commit is contained in:
Eric House 2012-12-31 07:08:41 -08:00
parent d1941090c5
commit 8b2712bd9e
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,6 +96,7 @@ public class DlgDelegate {
public Dialog onCreateDialog( int id ) public Dialog onCreateDialog( int id )
{ {
DbgUtils.logf("onCreateDialog(id=%d)", id );
Dialog dialog = null; Dialog dialog = null;
DlgState state = findForID( id ); DlgState state = findForID( id );
switch( id ) { switch( id ) {
@ -103,16 +104,16 @@ public class DlgDelegate {
dialog = createAboutDialog(); dialog = createAboutDialog();
break; break;
case DIALOG_OKONLY: case DIALOG_OKONLY:
dialog = createOKDialog( state ); dialog = createOKDialog( state, id );
break; break;
case DIALOG_NOTAGAIN: case DIALOG_NOTAGAIN:
dialog = createNotAgainDialog( state ); dialog = createNotAgainDialog( state, id );
break; break;
case CONFIRM_THEN: case CONFIRM_THEN:
dialog = createConfirmThenDialog( state ); dialog = createConfirmThenDialog( state, id );
break; break;
case TEXT_OR_HTML_THEN: case TEXT_OR_HTML_THEN:
dialog = createHtmlThenDialog( state ); dialog = createHtmlThenDialog( state, id );
break; break;
case DLG_DICTGONE: case DLG_DICTGONE:
dialog = createDictGoneDialog(); dialog = createDictGoneDialog();
@ -123,6 +124,7 @@ public class DlgDelegate {
public void onPrepareDialog( int id, Dialog dialog ) public void onPrepareDialog( int id, Dialog dialog )
{ {
DbgUtils.logf("onPrepareDialog(id=%d)", id );
AlertDialog ad = (AlertDialog)dialog; AlertDialog ad = (AlertDialog)dialog;
OnClickListener lstnr; OnClickListener lstnr;
DlgState state; DlgState state;
@ -357,7 +359,7 @@ public class DlgDelegate {
.create(); .create();
} }
private Dialog createOKDialog( DlgState state ) private Dialog createOKDialog( DlgState state, int id )
{ {
Dialog dialog = new AlertDialog.Builder( m_activity ) Dialog dialog = new AlertDialog.Builder( m_activity )
.setTitle( R.string.info_title ) .setTitle( R.string.info_title )
@ -365,12 +367,12 @@ public class DlgDelegate {
.setPositiveButton( R.string.button_ok, null ) .setPositiveButton( R.string.button_ok, null )
.create(); .create();
if ( 0 != state.m_cbckID ) { if ( 0 != state.m_cbckID ) {
dialog = setCallbackDismissListener( dialog, state ); dialog = setCallbackDismissListener( dialog, state, id );
} }
return dialog; return dialog;
} }
private Dialog createNotAgainDialog( final DlgState state ) private Dialog createNotAgainDialog( final DlgState state, int id )
{ {
OnClickListener lstnr_p = mkCallbackClickListener( state ); OnClickListener lstnr_p = mkCallbackClickListener( state );
@ -394,10 +396,10 @@ public class DlgDelegate {
.setNegativeButton( R.string.button_notagain, lstnr_n ) .setNegativeButton( R.string.button_notagain, lstnr_n )
.create(); .create();
return setCallbackDismissListener( dialog, state ); return setCallbackDismissListener( dialog, state, id );
} // createNotAgainDialog } // createNotAgainDialog
private Dialog createConfirmThenDialog( DlgState state ) private Dialog createConfirmThenDialog( DlgState state, int id )
{ {
OnClickListener lstnr = mkCallbackClickListener( state ); OnClickListener lstnr = mkCallbackClickListener( state );
@ -408,10 +410,10 @@ public class DlgDelegate {
.setNegativeButton( R.string.button_cancel, lstnr ) .setNegativeButton( R.string.button_cancel, lstnr )
.create(); .create();
return setCallbackDismissListener( dialog, state ); return setCallbackDismissListener( dialog, state, id );
} }
private Dialog createHtmlThenDialog( DlgState state ) private Dialog createHtmlThenDialog( DlgState state, int id )
{ {
OnClickListener lstnr = mkCallbackClickListener( state ); OnClickListener lstnr = mkCallbackClickListener( state );
Dialog dialog = new AlertDialog.Builder( m_activity ) Dialog dialog = new AlertDialog.Builder( m_activity )
@ -421,7 +423,7 @@ public class DlgDelegate {
.setNegativeButton( R.string.button_html, lstnr ) .setNegativeButton( R.string.button_html, lstnr )
.create(); .create();
return setCallbackDismissListener( dialog, state ); return setCallbackDismissListener( dialog, state, id );
} }
private Dialog createDictGoneDialog() private Dialog createDictGoneDialog()
@ -455,8 +457,9 @@ public class DlgDelegate {
return cbkOnClickLstnr; return cbkOnClickLstnr;
} }
private Dialog setCallbackDismissListener( Dialog dialog, private Dialog setCallbackDismissListener( final Dialog dialog,
final DlgState state ) final DlgState state,
final int id )
{ {
DialogInterface.OnDismissListener cbkOnDismissLstnr; DialogInterface.OnDismissListener cbkOnDismissLstnr;
cbkOnDismissLstnr = new DialogInterface.OnDismissListener() { cbkOnDismissLstnr = new DialogInterface.OnDismissListener() {
@ -466,6 +469,7 @@ public class DlgDelegate {
m_clickCallback.dlgButtonClicked( state.m_cbckID, m_clickCallback.dlgButtonClicked( state.m_cbckID,
DISMISS_BUTTON ); DISMISS_BUTTON );
} }
m_activity.removeDialog( id );
} }
}; };
@ -511,7 +515,7 @@ public class DlgDelegate {
private DlgState findForID( int id ) private DlgState findForID( int id )
{ {
DlgState state = null; DlgState state = null;
if ( m_dlgState.m_id == id ) { if ( null != m_dlgState && m_dlgState.m_id == id ) {
state = m_dlgState; state = m_dlgState;
} }
DbgUtils.logf( "findForID(%d)=>%H", id, state ); DbgUtils.logf( "findForID(%d)=>%H", id, state );
@ -523,7 +527,7 @@ public class DlgDelegate {
DbgUtils.logf( "dropState(%H) m_dlgState=%H", state, m_dlgState ); DbgUtils.logf( "dropState(%H) m_dlgState=%H", state, m_dlgState );
Assert.assertNotNull( m_dlgState ); Assert.assertNotNull( m_dlgState );
Assert.assertNotNull( state ); Assert.assertNotNull( state );
Assert.assertTrue( m_dlgState == state ); // fired Assert.assertTrue( m_dlgState == state );
m_dlgState = null; m_dlgState = null;
} }