fix NPE and remove assertion: moving from anon to GCM-based relayID is

common
This commit is contained in:
Eric House 2015-07-24 06:39:39 -07:00
parent 3c2a56166c
commit ed8d2ba0f6

View file

@ -94,9 +94,9 @@ public class DevID {
DbgUtils.logdf( "DevID.setRelayDevID()" ); DbgUtils.logdf( "DevID.setRelayDevID()" );
if ( BuildConfig.DEBUG ) { if ( BuildConfig.DEBUG ) {
String oldID = getRelayDevID( context ); String oldID = getRelayDevID( context );
if ( 0 < oldID.length() && ! devID.equals( oldID ) ) { if ( null != oldID && 0 < oldID.length()
DbgUtils.logf( "devID changing!!!: %s => %s", oldID, devID ); && ! devID.equals( oldID ) ) {
Assert.fail(); DbgUtils.logdf( "devID changing!!!: %s => %s", oldID, devID );
} }
} }
DBUtils.setStringFor( context, DEVID_KEY, devID ); DBUtils.setStringFor( context, DEVID_KEY, devID );