fix a couple of NPEs

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

View file

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

View file

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