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

remove mistaken test: relay's an option too and always supported

Browse source
This commit is contained in:
Eric House 2015-07-22 06:50:05 -07:00
parent dad39eedde
commit 59f9dd51b8
1 changed files with 44 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2356,55 +2356,52 @@ public class BoardDelegate extends DelegateBase
private void tryInvites() private void tryInvites()
{ {
if ( XWApp.BTSUPPORTED || XWApp.SMSSUPPORTED ) { if ( 0 < m_nMissing && m_summary.hasRematchInfo() ) {
// test if summary knows of rematch pending first tryRematchInvites();
if ( 0 < m_nMissing && m_summary.hasRematchInfo() ) { } else if ( null != m_missingDevs ) {
tryRematchInvites(); Assert.assertNotNull( m_missingMeans );
} else if ( null != m_missingDevs ) { String gameName = GameUtils.getName( m_activity, m_rowid );
Assert.assertNotNull( m_missingMeans ); m_invitesPending = m_missingDevs.length;
String gameName = GameUtils.getName( m_activity, m_rowid ); for ( int ii = 0; ii < m_missingDevs.length; ++ii ) {
m_invitesPending = m_missingDevs.length; String dev = m_missingDevs[ii];
for ( int ii = 0; ii < m_missingDevs.length; ++ii ) { int nPlayers = m_missingCounts[ii];
String dev = m_missingDevs[ii]; Assert.assertTrue( 0 <= m_nGuestDevs );
int nPlayers = m_missingCounts[ii]; int forceChannel = ii + m_nGuestDevs + 1;
Assert.assertTrue( 0 <= m_nGuestDevs ); NetLaunchInfo nli = new NetLaunchInfo( m_summary, m_gi,
int forceChannel = ii + m_nGuestDevs + 1; nPlayers, forceChannel );
NetLaunchInfo nli = new NetLaunchInfo( m_summary, m_gi, if ( !m_relayConnected ) {
nPlayers, forceChannel ); nli.removeAddress( CommsConnType.COMMS_CONN_RELAY );
if ( !m_relayConnected ) { }
nli.removeAddress( CommsConnType.COMMS_CONN_RELAY );
} switch ( m_missingMeans ) {
case BLUETOOTH:
switch ( m_missingMeans ) { if ( ! m_progressShown ) {
case BLUETOOTH: m_progressShown = true;
if ( ! m_progressShown ) { String progMsg = BTService.nameForAddr( dev );
m_progressShown = true; progMsg = getString( R.string.invite_progress_fmt, progMsg );
String progMsg = BTService.nameForAddr( dev ); startProgress( R.string.invite_progress_title, progMsg,
progMsg = getString( R.string.invite_progress_fmt, progMsg ); new OnCancelListener() {
startProgress( R.string.invite_progress_title, progMsg, public void onCancel( DialogInterface dlg )
new OnCancelListener() { {
public void onCancel( DialogInterface dlg ) m_progressShown = false;
{ }
m_progressShown = false; });
} }
}); BTService.inviteRemote( m_activity, dev, nli );
} break;
BTService.inviteRemote( m_activity, dev, nli ); case SMS:
break; SMSService.inviteRemote( m_activity, dev, nli );
case SMS: break;
SMSService.inviteRemote( m_activity, dev, nli ); case RELAY:
break; int destDevID = Integer.parseInt( dev );
case RELAY: RelayService.inviteRemote( m_activity, destDevID,
int destDevID = Integer.parseInt( dev ); null, nli );
RelayService.inviteRemote( m_activity, destDevID, break;
null, nli );
break;
}
} }
m_missingDevs = null;
m_missingCounts = null;
m_missingMeans = null;
} }
m_missingDevs = null;
m_missingCounts = null;
m_missingMeans = null;
} }
} }
@ -2599,7 +2596,6 @@ public class BoardDelegate extends DelegateBase
if ( null != value ) { if ( null != value ) {
BTService.inviteRemote( m_activity, value, nli ); BTService.inviteRemote( m_activity, value, nli );
} }
value = m_summary.getStringExtra( GameSummary.EXTRA_REMATCH_RELAY ); value = m_summary.getStringExtra( GameSummary.EXTRA_REMATCH_RELAY );
if ( null != value ) { if ( null != value ) {
RelayService.inviteRemote( m_activity, 0, value, nli ); RelayService.inviteRemote( m_activity, 0, value, nli );