Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove do-you-want-to-invite dialog when NFC used for relay case too

Browse source
This commit is contained in:
Eric House 2014-09-17 06:52:57 -07:00
parent e7e04fc2bb
commit e3667dde2f
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1169,13 +1169,14 @@ public class BoardDelegate extends DelegateBase
Assert.assertNotNull( room );
data = NetLaunchInfo.makeLaunchJSON( room, inviteID, m_gi.dictLang,
m_gi.dictName, m_gi.nPlayers );
removeDialog( DlgID.DLG_INVITE );
}
break;
case COMMS_CONN_BT:
if ( 0 < m_nMissingPlayers ) {
data = BTLaunchInfo.makeLaunchJSON( m_gi.gameID, m_gi.dictLang,
m_gi.dictName, m_gi.nPlayers );
dismissConfirmThen();
removeDialog( DlgID.CONFIRM_THEN );
}
break;
default:

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
View file

@ -381,11 +381,6 @@ public class DelegateBase implements DlgDelegate.DlgClickNotify,
m_delegate.showConfirmThen( msgID, action );
}
protected void dismissConfirmThen()
{
m_delegate.dismissConfirmThen();
}
protected boolean post( Runnable runnable )
{
return m_delegate.post( runnable );

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

@ -311,15 +311,6 @@ public class DlgDelegate {
showDialog( DlgID.CONFIRM_THEN );
}
public void dismissConfirmThen()
{
try {
m_activity.dismissDialog( DlgID.CONFIRM_THEN.ordinal() );
} catch ( java.lang.IllegalArgumentException iae ) {
// Do nothing. It's ok for the thing not to be there.
}
}
public void showInviteChoicesThen( final Action action )
{
if ( Utils.deviceSupportsSMS( m_activity )