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

fix a couple of NPEs

Browse source
This commit is contained in:
Eric House 2014-12-01 07:01:10 -08:00
parent fe76cfa1a1
commit 73851b285e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -269,6 +269,7 @@ public class BoardDelegate extends DelegateBase
}; };
ab.setNegativeButton( R.string.button_rematch, lstnr ); ab.setNegativeButton( R.string.button_rematch, lstnr );
} else if ( DlgID.DLG_CONNSTAT == dlgID && } else if ( DlgID.DLG_CONNSTAT == dlgID &&
null != m_connTypes &&
m_connTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ) { m_connTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ) {
lstnr = new DialogInterface.OnClickListener() { lstnr = new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg, public void onClick( DialogInterface dlg,

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

@ -171,7 +171,7 @@ public class ConnStatusHandler {
public static String getStatusText( Context context, CommsConnTypeSet connTypes ) public static String getStatusText( Context context, CommsConnTypeSet connTypes )
{ {
String msg; String msg;
if ( 0 == connTypes.size() ) { if ( null == connTypes || 0 == connTypes.size() ) {
msg = LocUtils.getString( context, R.string.connstat_nonet ); msg = LocUtils.getString( context, R.string.connstat_nonet );
} else { } else {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();