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

exit board when invite alert cancelled

Browse source
This commit is contained in:
Eric House 2015-01-26 07:25:46 -08:00
parent 5f5e35e885
commit 8044fb0fc7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -24,6 +24,7 @@ import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnDismissListener; import android.content.DialogInterface.OnDismissListener;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@ -475,6 +476,11 @@ public class BoardDelegate extends DelegateBase
.setMessage( "" ) .setMessage( "" )
.setPositiveButton( R.string.newgame_invite, lstnr ) .setPositiveButton( R.string.newgame_invite, lstnr )
.setNegativeButton( R.string.button_close_game, lstnr2 ) .setNegativeButton( R.string.button_close_game, lstnr2 )
.setOnCancelListener( new OnCancelListener() {
public void onCancel( DialogInterface dialog ) {
finish();
}
} )
.create(); .create();
break; break;
@ -657,7 +663,7 @@ public class BoardDelegate extends DelegateBase
// in case of change... // in case of change...
setBackgroundColor(); setBackgroundColor();
setKeepScreenOn(); setKeepScreenOn();
} else if ( 0 < m_nMissing ) { } else if ( 0 < m_nMissing && ! m_activity.isFinishing() ) {
showDialog( DlgID.DLG_INVITE ); showDialog( DlgID.DLG_INVITE );
} }
} }
@ -2237,7 +2243,7 @@ public class BoardDelegate extends DelegateBase
String progMsg = BTService.nameForAddr( dev ); String progMsg = BTService.nameForAddr( dev );
progMsg = getString( R.string.invite_progress_fmt, progMsg ); progMsg = getString( R.string.invite_progress_fmt, progMsg );
startProgress( R.string.invite_progress_title, progMsg, startProgress( R.string.invite_progress_title, progMsg,
new DialogInterface.OnCancelListener() { new OnCancelListener() {
public void onCancel( DialogInterface dlg ) public void onCancel( DialogInterface dlg )
{ {
m_progressShown = false; m_progressShown = false;