Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't include colons in nli's BT addr (to save space)

Browse source
This commit is contained in:
Eric House 2020-11-21 16:04:08 -08:00
parent f067144ec5
commit 5031afa3ff
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
View file

@ -54,7 +54,7 @@ public class NetLaunchInfo implements Serializable {
private static final String PHONE_KEY = "phn"; private static final String PHONE_KEY = "phn";
private static final String GSM_KEY = "gsm"; private static final String GSM_KEY = "gsm";
private static final String OSVERS_KEY = "osv"; private static final String OSVERS_KEY = "osv";
private static final String BTADDR_KEY = "bta"; private static final String BTADDR_KEY = "btas";
private static final String BTNAME_KEY = "btn"; private static final String BTNAME_KEY = "btn";
private static final String ROOM_KEY = "room"; private static final String ROOM_KEY = "room";
private static final String ID_KEY = "id"; private static final String ID_KEY = "id";
@ -203,7 +203,7 @@ public class NetLaunchInfo implements Serializable {
boolean doAdd; boolean doAdd;
switch ( typ ) { switch ( typ ) {
case COMMS_CONN_BT: case COMMS_CONN_BT:
btAddress = data.getQueryParameter( BTADDR_KEY ); btAddress = expand( data.getQueryParameter( BTADDR_KEY ) );
btName = data.getQueryParameter( BTNAME_KEY ); btName = data.getQueryParameter( BTNAME_KEY );
doAdd = !hasAddrs && null != btAddress; doAdd = !hasAddrs && null != btAddress;
break; break;
@ -615,7 +615,7 @@ public class NetLaunchInfo implements Serializable {
} }
if ( addrs.contains( CommsConnType.COMMS_CONN_BT ) ) { if ( addrs.contains( CommsConnType.COMMS_CONN_BT ) ) {
if ( null != btAddress ) { if ( null != btAddress ) {
ub.appendQueryParameter( BTADDR_KEY, btAddress ); ub.appendQueryParameter( BTADDR_KEY, shorten(btAddress) );
} }
ub.appendQueryParameter( BTNAME_KEY, btName ); ub.appendQueryParameter( BTNAME_KEY, btName );
} }
@ -759,6 +759,31 @@ public class NetLaunchInfo implements Serializable {
_conTypes = addrs.toInt(); _conTypes = addrs.toInt();
} }
private String shorten( String addr )
{
String result = null;
if ( ! TextUtils.isEmpty( addr ) ) {
String[] pairs = TextUtils.split( addr, ":" );
result = TextUtils.join( "", pairs );
}
return result;
}
private String expand( String addr )
{
String result = null;
if ( null != addr && 12 == addr.length() ) {
String[] pairs = new String[6];
for ( int ii = 0; ii < 6; ++ii ) {
int start = ii * 2;
pairs[ii] = addr.substring( start, start + 2 );
}
result = TextUtils.join( ":", pairs );
}
return result;
}
private void calcValid() private void calcValid()
{ {
boolean valid = hasCommon(); boolean valid = hasCommon();