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

keep INVITE alert up for rematch game

Browse source 
Game created for rematch was coming up unconnected and without
explanation if recipient of invitation hadn't responded. Don't dismiss
the INVITE alert in that case.
This commit is contained in:
Eric House 2016-08-07 11:54:45 -07:00
parent 9909750605
commit dddfa2e269
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1544,29 +1544,28 @@ public class BoardDelegate extends DelegateBase
}
} else if ( nMissing > 0 ) {
if ( m_summary.hasRematchInfo() ) {
tryRematchInvites( false );
skipDismiss = !tryRematchInvites( false );
} else if ( !m_haveInvited ) {
m_haveInvited = true;
m_room = room;
showDialog( DlgID.DLG_INVITE );
invalidateOptionsMenuIf();
skipDismiss = true;
} else {
if ( !m_haveInvited ) {
m_haveInvited = true;
m_room = room;
showDialog( DlgID.DLG_INVITE );
invalidateOptionsMenuIf();
skipDismiss = true;
toastStr = getQuantityString( R.plurals.msg_relay_waiting_fmt, nMissing,
devOrder, room, nMissing );
if ( devOrder == 1 ) {
naMsg = R.string.not_again_conndfirst;
naKey = R.string.key_notagain_conndfirst;
} else {
toastStr = getQuantityString( R.plurals.msg_relay_waiting_fmt, nMissing,
devOrder, room, nMissing );
if ( devOrder == 1 ) {
naMsg = R.string.not_again_conndfirst;
naKey = R.string.key_notagain_conndfirst;
} else {
naMsg = R.string.not_again_conndmid;
naKey = R.string.key_notagain_conndmid;
}
naMsg = R.string.not_again_conndmid;
naKey = R.string.key_notagain_conndmid;
}
}
}
if ( null != toastStr ) {
DbgUtils.logf( "handleConndMessage(): toastStr: %s", toastStr );
m_toastStr = toastStr;
if ( naMsg == 0 ) {
dlgButtonClicked( Action.SHOW_EXPL_ACTION,
@ -2697,7 +2696,8 @@ public class BoardDelegate extends DelegateBase
}
}
private void tryRematchInvites( boolean force )
// Return true if anything sent
private boolean tryRematchInvites( boolean force )
{
if ( XWApp.REMATCH_SUPPORTED ) {
if ( !force ) {
@ -2733,6 +2733,7 @@ public class BoardDelegate extends DelegateBase
showToast( R.string.rematch_sent_toast );
}
}
return force;
}
private void sendSMSInviteIf( String phone, NetLaunchInfo nli,