Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use gameID as inviteID when it's not provided. Originally it was a

Browse source 
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
This commit is contained in:
Eric House 2014-11-21 08:02:18 -08:00
parent 67d41f34a3
commit 38e37bfbb9
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -465,7 +465,7 @@ public class GameUtils {
return makeNewMultiGame( context, sink, DBUtils.GROUPID_UNSPEC, addr, return makeNewMultiGame( context, sink, DBUtils.GROUPID_UNSPEC, addr,
new int[] {nli.lang}, new String[] { nli.dict }, new int[] {nli.lang}, new String[] { nli.dict },
nli.nPlayersT, 1, nli.inviteID, nli.nPlayersT, 1, nli.inviteID(),
nli.gameID, false ); nli.gameID, false );
} }

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

@ -49,7 +49,6 @@ public class NetLaunchInfo {
protected int nPlayersT; protected int nPlayersT;
protected int nPlayersH; protected int nPlayersH;
protected String room; // relay protected String room; // relay
protected String inviteID; // relay
protected String btName; protected String btName;
protected String btAddress; protected String btAddress;
protected String phone; // SMS protected String phone; // SMS
@ -61,6 +60,7 @@ public class NetLaunchInfo {
private CommsConnTypeSet m_addrs; private CommsConnTypeSet m_addrs;
private JSONObject m_json; private JSONObject m_json;
private boolean m_valid; private boolean m_valid;
private String m_inviteID;
public NetLaunchInfo() public NetLaunchInfo()
{ {
@ -90,7 +90,7 @@ public class NetLaunchInfo {
break; break;
case COMMS_CONN_RELAY: case COMMS_CONN_RELAY:
room = m_json.optString( MultiService.ROOM ); room = m_json.optString( MultiService.ROOM );
inviteID = m_json.optString( MultiService.INVITEID ); m_inviteID = m_json.optString( MultiService.INVITEID );
break; break;
case COMMS_CONN_SMS: case COMMS_CONN_SMS:
phone = m_json.optString( "phn" ); phone = m_json.optString( "phn" );
@ -112,7 +112,7 @@ public class NetLaunchInfo {
public NetLaunchInfo( Bundle bundle ) public NetLaunchInfo( Bundle bundle )
{ {
room = bundle.getString( MultiService.ROOM ); room = bundle.getString( MultiService.ROOM );
inviteID = bundle.getString( MultiService.INVITEID ); m_inviteID = bundle.getString( MultiService.INVITEID );
lang = bundle.getInt( MultiService.LANG ); lang = bundle.getInt( MultiService.LANG );
dict = bundle.getString( MultiService.DICT ); dict = bundle.getString( MultiService.DICT );
gameName= bundle.getString( MultiService.GAMENAME ); gameName= bundle.getString( MultiService.GAMENAME );
@ -142,10 +142,10 @@ public class NetLaunchInfo {
JSONObject json = new JSONObject( new String( buf ) ); JSONObject json = new JSONObject( new String( buf ) );
room = json.getString( MultiService.ROOM ); room = json.getString( MultiService.ROOM );
inviteID = json.getString( MultiService.INVITEID ); m_inviteID = json.getString( MultiService.INVITEID );
} else { } else {
room = data.getQueryParameter( "room" ); room = data.getQueryParameter( "room" );
inviteID = data.getQueryParameter( "id" ); m_inviteID = data.getQueryParameter( "id" );
dict = data.getQueryParameter( "wl" ); dict = data.getQueryParameter( "wl" );
String langStr = data.getQueryParameter( "lang" ); String langStr = data.getQueryParameter( "lang" );
lang = Integer.decode( langStr ); lang = Integer.decode( langStr );
@ -163,7 +163,7 @@ public class NetLaunchInfo {
public NetLaunchInfo( Intent intent ) public NetLaunchInfo( Intent intent )
{ {
room = intent.getStringExtra( MultiService.ROOM ); room = intent.getStringExtra( MultiService.ROOM );
inviteID = intent.getStringExtra( MultiService.INVITEID ); m_inviteID = intent.getStringExtra( MultiService.INVITEID );
lang = intent.getIntExtra( MultiService.LANG, -1 ); lang = intent.getIntExtra( MultiService.LANG, -1 );
dict = intent.getStringExtra( MultiService.DICT ); dict = intent.getStringExtra( MultiService.DICT );
gameName = intent.getStringExtra( MultiService.GAMENAME ); gameName = intent.getStringExtra( MultiService.GAMENAME );
@ -216,10 +216,20 @@ public class NetLaunchInfo {
} }
} }
public String inviteID()
{
String result = m_inviteID;
if ( null == result ) {
result = GameUtils.formatGameID( gameID );
DbgUtils.logf( "inviteID(): m_inviteID null so substituting %s", result );
}
return result;
}
public void putSelf( Bundle bundle ) public void putSelf( Bundle bundle )
{ {
bundle.putString( MultiService.ROOM, room ); bundle.putString( MultiService.ROOM, room );
bundle.putString( MultiService.INVITEID, inviteID ); bundle.putString( MultiService.INVITEID, m_inviteID );
bundle.putInt( MultiService.LANG, lang ); bundle.putInt( MultiService.LANG, lang );
bundle.putString( MultiService.DICT, dict ); bundle.putString( MultiService.DICT, dict );
bundle.putString( MultiService.GAMENAME, gameName ); bundle.putString( MultiService.GAMENAME, gameName );
@ -244,7 +254,7 @@ public class NetLaunchInfo {
.put( MultiService.NPLAYERST, nPlayersT ) .put( MultiService.NPLAYERST, nPlayersT )
.put( MultiService.NPLAYERSH, nPlayersH ) .put( MultiService.NPLAYERSH, nPlayersH )
.put( MultiService.ROOM, room ) .put( MultiService.ROOM, room )
.put( MultiService.INVITEID, inviteID ) .put( MultiService.INVITEID, m_inviteID )
.put( MultiService.GAMEID, gameID ) .put( MultiService.GAMEID, gameID )
.put( MultiService.BT_NAME, btName ) .put( MultiService.BT_NAME, btName )
.put( MultiService.BT_ADDRESS, btAddress ) .put( MultiService.BT_ADDRESS, btAddress )
@ -298,7 +308,7 @@ public class NetLaunchInfo {
if ( m_addrs.contains( CommsConnType.COMMS_CONN_RELAY ) ) { if ( m_addrs.contains( CommsConnType.COMMS_CONN_RELAY ) ) {
ub.appendQueryParameter( "room", room ); ub.appendQueryParameter( "room", room );
ub.appendQueryParameter( "id", inviteID ); ub.appendQueryParameter( "id", m_inviteID );
} }
if ( m_addrs.contains( CommsConnType.COMMS_CONN_BT ) ) { if ( m_addrs.contains( CommsConnType.COMMS_CONN_BT ) ) {
ub.appendQueryParameter( "bta", btAddress ); ub.appendQueryParameter( "bta", btAddress );
@ -329,10 +339,10 @@ public class NetLaunchInfo {
return ub.build(); return ub.build();
} }
public void addRelayInfo( String aRoom, String anInviteID ) public void addRelayInfo( String aRoom, String inviteID )
{ {
room = aRoom; room = aRoom;
inviteID = anInviteID; m_inviteID = inviteID;
m_addrs.add( CommsConnType.COMMS_CONN_RELAY ); m_addrs.add( CommsConnType.COMMS_CONN_RELAY );
} }
@ -388,7 +398,7 @@ public class NetLaunchInfo {
valid && iter.hasNext(); ) { valid && iter.hasNext(); ) {
switch ( iter.next() ) { switch ( iter.next() ) {
case COMMS_CONN_RELAY: case COMMS_CONN_RELAY:
valid = null != room && null != inviteID; valid = null != room && null != m_inviteID;
break; break;
case COMMS_CONN_BT: case COMMS_CONN_BT:
valid = null != btAddress && 0 != gameID; valid = null != btAddress && 0 != gameID;