Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

pass forceChannel as part of invitation

Browse source
This commit is contained in:
Eric House 2014-12-30 07:25:26 -08:00
parent 28bfa3c904
commit d46c7a39f1
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2204,8 +2204,10 @@ public class BoardDelegate extends DelegateBase
Assert.assertNotNull( m_missingMeans );
String gameName = GameUtils.getName( m_activity, m_rowid );
m_invitesPending = m_missingDevs.length;
NetLaunchInfo nli = new NetLaunchInfo( m_summary, m_gi, 1 );
for ( String dev : m_missingDevs ) {
for ( int ii = 0; ii < m_missingDevs.length; ++ii ) {
String dev = m_missingDevs[ii];
NetLaunchInfo nli = new NetLaunchInfo( m_summary, m_gi, 1,
1 + ii );
switch ( m_missingMeans ) {
case BLUETOOTH:
String progMsg = BTService.nameForAddr( dev );

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
View file

@ -191,10 +191,11 @@ public class NetLaunchInfo {
gameID = gamID;
}
public NetLaunchInfo( GameSummary summary, CurGameInfo gi, int numHere )
public NetLaunchInfo( GameSummary summary, CurGameInfo gi, int numHere, int fc )
{
this( summary, gi );
nPlayersH = numHere;
forceChannel = fc;
}
public NetLaunchInfo( GameSummary summary, CurGameInfo gi )
@ -242,6 +243,7 @@ public class NetLaunchInfo {
bundle.putInt( MultiService.GAMEID, gameID );
bundle.putString( MultiService.BT_NAME, btName );
bundle.putString( MultiService.BT_ADDRESS, btAddress );
bundle.putInt( MultiService.FORCECHANNEL, forceChannel );
int flags = DBUtils.connTypeSetToInt( m_addrs );
bundle.putInt( ADDRS_KEY, flags );
@ -262,6 +264,7 @@ public class NetLaunchInfo {
.put( MultiService.GAMEID, gameID )
.put( MultiService.BT_NAME, btName )
.put( MultiService.BT_ADDRESS, btAddress )
.put( MultiService.FORCECHANNEL, forceChannel )
.put( ADDRS_KEY, DBUtils.connTypeSetToInt( m_addrs ) )
.toString();
} catch ( org.json.JSONException jse ) {
@ -305,7 +308,8 @@ public class NetLaunchInfo {
.appendQueryParameter( "lang", String.format("%d", lang ) )
.appendQueryParameter( "np", String.format( "%d", nPlayersT ) )
.appendQueryParameter( "nh", String.format( "%d", nPlayersH ) )
.appendQueryParameter( "gid", String.format( "%d", nPlayersT ) );
.appendQueryParameter( "gid", String.format( "%d", nPlayersT ) )
.appendQueryParameter( "fc", String.format( "%d", forceChannel ) );
if ( null != dict ) {
ub.appendQueryParameter( "wl", dict );
}