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

fix NPE rematching standalone games

Browse source
This commit is contained in:
Eric House 2015-07-11 17:30:43 -07:00
parent 7ac5d2259d
commit a96afb2892
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -2260,18 +2260,19 @@ public class GamesListDelegate extends ListDelegateBase
{ {
Intent intent = null; Intent intent = null;
if ( XWApp.REMATCH_SUPPORTED ) { if ( XWApp.REMATCH_SUPPORTED ) {
DbgUtils.logf( "makeRematchIntent(btAddr=%s; phone=%s)", btAddr, phone );
intent = makeSelfIntent( context ); intent = makeSelfIntent( context );
intent.putExtra( REMATCH_ROWID_EXTRA, rowid ); intent.putExtra( REMATCH_ROWID_EXTRA, rowid );
intent.putExtra( REMATCH_ADDRS_EXTRA, addrTypes.toInt() ); if ( null != addrTypes ) {
if ( null != btAddr ) { intent.putExtra( REMATCH_ADDRS_EXTRA, addrTypes.toInt() ); // here
intent.putExtra( REMATCH_BTADDR_EXTRA, btAddr ); if ( null != btAddr ) {
} intent.putExtra( REMATCH_BTADDR_EXTRA, btAddr );
if ( null != phone ) { }
intent.putExtra( REMATCH_PHONE_EXTRA, phone ); if ( null != phone ) {
} intent.putExtra( REMATCH_PHONE_EXTRA, phone );
if ( null != relayID ) { }
intent.putExtra( REMATCH_RELAYID_EXTRA, relayID ); if ( null != relayID ) {
intent.putExtra( REMATCH_RELAYID_EXTRA, relayID );
}
} }
} }
return intent; return intent;