Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass 0 to dlgButtonClicked() for dismiss, as -1 is the value of a

Browse source 
button!  Also assert the heck out of callbackIds to see if Android is
guaranteeing that no two dialogs can be up at once.  I'm counting on
that, and need to know if it's not true.
This commit is contained in:
Andy2 2011-08-24 21:44:10 -07:00
parent 1cd1a849e6
commit 5aeac29787
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,8 @@ public class DlgDelegate {
}
private int m_msgID;
private int m_cbckID;
private int m_cbckID = 0; // if this can be set twice I have a
// problem. See asserts below.
private String m_msg;
private Runnable m_proc = null;
private int m_prefsKey;
@ -172,12 +173,16 @@ public class DlgDelegate {
public void showConfirmThen( String msg, int callbackID )
{
m_msg = msg;
Assert.assertTrue( 0 != callbackID );
Assert.assertTrue( 0 == m_cbckID );
m_cbckID = callbackID;
m_activity.showDialog( CONFIRM_THEN );
}
public void showTextOrHtmlThen( int callbackID )
{
Assert.assertTrue( 0 != callbackID );
Assert.assertTrue( 0 == m_cbckID );
m_cbckID = callbackID;
m_activity.showDialog( TEXT_OR_HTML_THEN );
}
@ -318,6 +323,7 @@ public class DlgDelegate {
if ( null == s_cbkOnClickLstnr ) {
s_cbkOnClickLstnr = new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg, int button ) {
Assert.assertTrue( 0 != m_cbckID );
m_clickCallback.dlgButtonClicked( m_cbckID, button );
}
};
@ -330,7 +336,9 @@ public class DlgDelegate {
if ( null == s_cbkOnDismissLstnr ) {
s_cbkOnDismissLstnr = new DialogInterface.OnDismissListener() {
public void onDismiss( DialogInterface di ) {
m_clickCallback.dlgButtonClicked( m_cbckID, -1 );
Assert.assertTrue( 0 != m_cbckID );
m_clickCallback.dlgButtonClicked( m_cbckID, 0 );
m_cbckID = 0;
}
};
}