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

formatting changes only

Browse source
This commit is contained in:
Eric House 2022-05-15 11:09:24 -07:00
parent 71e957421c
commit 6236042ee1
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/build.gradle
View file

@ -375,6 +375,8 @@ dependencies {
// java.nio.charset.StandardCharsets not defined. Does not crash on // java.nio.charset.StandardCharsets not defined. Does not crash on
// 19 (KitKat). // 19 (KitKat).
if ( USE_KITKAT_MQTT ) { if ( USE_KITKAT_MQTT ) {
// Most recent seems to be 1.2.5 tagged July 2020.
// https://github.com/eclipse/paho.mqtt.java/tags
implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.+" implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.+"
} else { } else {
implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.+" implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.+"

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

@ -47,7 +47,8 @@ import org.eehouse.android.xw4.jni.CommsAddrRec;
import org.eehouse.android.xw4.jni.XwJNI; import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.loc.LocUtils; 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 final String KEY_LAST_WRITE = TAG + "/last_write";
@ -487,21 +488,24 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
clearInstance( this ); clearInstance( this );
} }
public static void inviteRemote( Context context, String invitee, NetLaunchInfo nli ) public static void inviteRemote( Context context, String invitee,
NetLaunchInfo nli )
{ {
String[] topic = {invitee}; String[] topic = {invitee};
byte[] packet = XwJNI.dvc_makeMQTTInvite( nli, topic ); byte[] packet = XwJNI.dvc_makeMQTTInvite( nli, topic );
addToSendQueue( context, topic[0], packet ); addToSendQueue( context, topic[0], packet );
} }
private static void notifyNotHere( Context context, String addressee, int gameID ) private static void notifyNotHere( Context context, String addressee,
int gameID )
{ {
String[] topic = {addressee}; String[] topic = {addressee};
byte[] packet = XwJNI.dvc_makeMQTTNoSuchGame( gameID, topic ); byte[] packet = XwJNI.dvc_makeMQTTNoSuchGame( gameID, topic );
addToSendQueue( context, topic[0], packet ); addToSendQueue( context, topic[0], packet );
} }
public static int send( Context context, String addressee, int gameID, byte[] buf ) public static int send( Context context, String addressee, int gameID,
byte[] buf )
{ {
Log.d( TAG, "send(to:%s, len: %d)", addressee, buf.length ); Log.d( TAG, "send(to:%s, len: %d)", addressee, buf.length );
Assert.assertTrueNR( 16 == addressee.length() ); Assert.assertTrueNR( 16 == addressee.length() );
@ -511,7 +515,8 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
return buf.length; return buf.length;
} }
private static void addToSendQueue( Context context, String topic, byte[] packet ) private static void addToSendQueue( Context context, String topic,
byte[] packet )
{ {
MQTTUtils instance = getOrStart( context ); MQTTUtils instance = getOrStart( context );
if ( null != instance ) { if ( null != instance ) {
@ -562,7 +567,8 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
} }
@Override @Override
public void messageArrived( String topic, MqttMessage message ) throws Exception public void messageArrived( String topic, MqttMessage message )
throws Exception
{ {
Log.d( TAG, "%H.messageArrived(topic=%s)", this, topic ); Log.d( TAG, "%H.messageArrived(topic=%s)", this, topic );
mMsgThread.add( topic, message.getPayload() ); mMsgThread.add( topic, message.getPayload() );
@ -584,7 +590,8 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
private void subscribe() private void subscribe()
{ {
Assert.assertTrueNR( null != mTopics && 2 == mTopics.length ); Assert.assertTrueNR( null != mTopics && 2 == mTopics.length );
final int qos = XWPrefs.getPrefsInt( mContext, R.string.key_mqtt_qos, 2 ); final int qos = XWPrefs
.getPrefsInt( mContext, R.string.key_mqtt_qos, 2 );
int qoss[] = { qos, qos }; int qoss[] = { qos, qos };
setState( State.SUBSCRIBING ); setState( State.SUBSCRIBING );
@ -603,7 +610,8 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
@Override @Override
public void onSuccess( IMqttToken asyncActionToken ) public void onSuccess( IMqttToken asyncActionToken )
{ {
Log.d( TAG, "%H.onSuccess(%s); cur state: %s", asyncActionToken, this, mState ); Log.d( TAG, "%H.onSuccess(%s); cur state: %s", asyncActionToken,
this, mState );
switch ( mState ) { switch ( mState ) {
case CONNECTING: case CONNECTING:
setState( State.CONNECTED ); setState( State.CONNECTED );
@ -619,14 +627,16 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
@Override @Override
public void onFailure(IMqttToken asyncActionToken, Throwable exception) public void onFailure(IMqttToken asyncActionToken, Throwable exception)
{ {
Log.d( TAG, "%H.onFailure(%s, %s); cur state: %s", this, asyncActionToken, Log.d( TAG, "%H.onFailure(%s, %s); cur state: %s", this,
exception, mState ); asyncActionToken, exception, mState );
ConnStatusHandler ConnStatusHandler
.updateStatus( mContext, null, CommsConnType.COMMS_CONN_MQTT, false ); .updateStatus( mContext, null, CommsConnType.COMMS_CONN_MQTT,
false );
} }
private class MsgThread extends Thread { private class MsgThread extends Thread {
private LinkedBlockingQueue<MessagePair> mQueue = new LinkedBlockingQueue<>(); private LinkedBlockingQueue<MessagePair> mQueue
= new LinkedBlockingQueue<>();
void add( String topic, byte[] msg ) { void add( String topic, byte[] msg ) {
mQueue.add( new MessagePair( topic, msg ) ); mQueue.add( new MessagePair( topic, msg ) );
@ -654,8 +664,8 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
} }
} }
long now = Utils.getCurSeconds(); long now = Utils.getCurSeconds();
Log.d( TAG, "%H.MsgThread.run() exiting after %d seconds", MQTTUtils.this, Log.d( TAG, "%H.MsgThread.run() exiting after %d seconds",
now - startTime ); MQTTUtils.this, now - startTime );
} }
private void postNotification( MessagePair pair ) throws JSONException private void postNotification( MessagePair pair ) throws JSONException