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

add tmp key to backstop model names

Browse source 
I'm using model names to detect duplicates, but there are enough that
may not suffice. So add a new random per-device ID to be used only until
the dupes are resolved.
This commit is contained in:
Eric House 2020-09-14 08:27:18 -07:00
parent e4594f36e0
commit 4b6f4047fb
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
View file

@ -49,6 +49,7 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
private static final String TAG = MQTTUtils.class.getSimpleName(); private static final String TAG = MQTTUtils.class.getSimpleName();
private static final String KEY_NEXT_REG = TAG + "/next_reg"; private static final String KEY_NEXT_REG = TAG + "/next_reg";
private static final String KEY_LAST_WRITE = TAG + "/last_write"; private static final String KEY_LAST_WRITE = TAG + "/last_write";
private static final String KEY_TMP_KEY = TAG + "/tmp_key";
private static enum State { NONE, CONNECTING, CONNECTED, SUBSCRIBING, SUBSCRIBED, private static enum State { NONE, CONNECTING, CONNECTED, SUBSCRIBING, SUBSCRIBED,
CLOSING }; CLOSING };
@ -314,6 +315,7 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
params.put( "myNow", now ); params.put( "myNow", now );
params.put( "loc", LocUtils.getCurLocale( mContext ) ); params.put( "loc", LocUtils.getCurLocale( mContext ) );
params.put( "knowsDup", true ); params.put( "knowsDup", true );
params.put( "tmpKey", getTmpKey(mContext) );
String fcmid = FBMService.getFCMDevID( mContext ); String fcmid = FBMService.getFCMDevID( mContext );
if ( null != fcmid ) { if ( null != fcmid ) {
@ -356,6 +358,19 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
} }
} }
private static int sTmpKey;
private static int getTmpKey( Context context )
{
while ( 0 == sTmpKey ) {
sTmpKey = DBUtils.getIntFor( context, KEY_TMP_KEY, 0 );
if ( 0 == sTmpKey ) {
sTmpKey = Math.abs( Utils.nextRandomInt() );
DBUtils.setIntFor( context, KEY_TMP_KEY, sTmpKey );
}
}
return sTmpKey;
}
private void disconnect() private void disconnect()
{ {
Log.d( TAG, "%H.disconnect()", this ); Log.d( TAG, "%H.disconnect()", this );