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

don't include relay in rematch addressing

Browse source
This commit is contained in:
Eric House 2021-04-01 13:26:25 -07:00
parent a1cabd6c4c
commit b9c34b2b31
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -2956,6 +2956,10 @@ public class BoardDelegate extends DelegateBase
if ( doIt ) { if ( doIt ) {
CommsConnTypeSet connTypes = summary.conTypes; CommsConnTypeSet connTypes = summary.conTypes;
if ( BuildConfig.NO_NEW_RELAY ) {
connTypes.remove(CommsConnType.COMMS_CONN_RELAY);
relayID = null;
}
String newName = summary.getRematchName( activity ); String newName = summary.getRematchName( activity );
Intent intent = GamesListDelegate Intent intent = GamesListDelegate
.makeRematchIntent( activity, rowid, groupID, gi, connTypes, .makeRematchIntent( activity, rowid, groupID, gi, connTypes,

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -3092,6 +3092,9 @@ public class GamesListDelegate extends ListDelegateBase
.putExtra( REMATCH_NEWNAME_EXTRA, newName ); .putExtra( REMATCH_NEWNAME_EXTRA, newName );
if ( null != addrTypes ) { if ( null != addrTypes ) {
if ( BuildConfig.NO_NEW_RELAY ) {
Assert.assertTrueNR( !addrTypes.contains(CommsConnType.COMMS_CONN_RELAY) );
}
intent.putExtra( REMATCH_ADDRS_EXTRA, addrTypes.toInt() ); intent.putExtra( REMATCH_ADDRS_EXTRA, addrTypes.toInt() );
if ( null != btAddr ) { if ( null != btAddr ) {
Assert.assertTrue( addrTypes.contains( CommsConnType.COMMS_CONN_BT ) ); Assert.assertTrue( addrTypes.contains( CommsConnType.COMMS_CONN_BT ) );