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

register with relay every time git rev changes

Browse source
This commit is contained in:
Eric House 2020-09-04 19:11:35 -07:00
parent 8a28be2b9c
commit 1e941acd2c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,11 +48,13 @@ import org.eehouse.android.xw4.loc.LocUtils;
public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallbackExtended { public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallbackExtended {
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 enum State { NONE, CONNECTING, CONNECTED, SUBSCRIBING, SUBSCRIBED, private static enum State { NONE, CONNECTING, CONNECTED, SUBSCRIBING, SUBSCRIBED,
CLOSING }; CLOSING };
private static MQTTUtils[] sInstance = {null}; private static MQTTUtils[] sInstance = {null};
private static long sNextReg = 0; private static long sNextReg = 0;
private static String sLastRev = null;
private MqttAsyncClient mClient; private MqttAsyncClient mClient;
private String mDevID; private String mDevID;
@ -295,10 +297,11 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
{ {
if ( 0 == sNextReg ) { if ( 0 == sNextReg ) {
sNextReg = DBUtils.getLongFor( mContext, KEY_NEXT_REG, 1 ); sNextReg = DBUtils.getLongFor( mContext, KEY_NEXT_REG, 1 );
sLastRev = DBUtils.getStringFor( mContext, KEY_LAST_WRITE, "" );
} }
long now = Utils.getCurSeconds(); long now = Utils.getCurSeconds();
Log.d( TAG, "registerOnce(): now: %d; nextReg: %d", now, sNextReg ); Log.d( TAG, "registerOnce(): now: %d; nextReg: %d", now, sNextReg );
if ( now > sNextReg ) { if ( now > sNextReg || ! BuildConfig.GIT_REV.equals(sLastRev) ) {
try { try {
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
params.put( "devid", mDevID ); params.put( "devid", mDevID );
@ -329,6 +332,8 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
if ( 0 < atNext ) { if ( 0 < atNext ) {
DBUtils.setLongFor( mContext, KEY_NEXT_REG, atNext ); DBUtils.setLongFor( mContext, KEY_NEXT_REG, atNext );
sNextReg = atNext; sNextReg = atNext;
DBUtils.setStringFor( mContext, KEY_LAST_WRITE, BuildConfig.GIT_REV );
sLastRev = BuildConfig.GIT_REV;
} }
} }
} else { } else {