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

fix assert: move disconnect into own thread

Browse source 
It's sometimes on the UI thread and so since it makes blocking calls
needs to be elsewhere. Give it its own thread.
This commit is contained in:
Eric House 2022-05-16 21:46:49 -07:00
parent 99e4905a68
commit 23241400f0
1 changed files with 45 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ public class MQTTUtils extends Thread
private static String sLastRev = null;
private MqttAsyncClient mClient;
private String mDevID;
private final String mDevID;
private String[] mTopics = { null, null };
private Context mContext;
private MsgThread mMsgThread;
@ -449,44 +449,7 @@ public class MQTTUtils extends Thread
if ( null == client ) {
Log.e( TAG, "disconnect(): null client" );
} else {
// If we're on the UI thread we probably want to spawn a thread
// for the blocking waitForCompletion() calls below
Assert.assertTrueNR( false == Utils.isOnUIThread() );
outer:
for ( int ii = 0; ; ++ii ) {
String action = null;
IMqttToken token = null;
try {
switch ( ii ) {
case 0:
action = "unsubscribe";
token = client.unsubscribe( mDevID );
break; // not continue, which skips the Log() below
case 1:
action = "disconnect";
token = client.disconnect();
break;
case 2:
action = "close";
client.close();
break;
default:
break outer;
}
if ( null != token ) {
Log.d( TAG, "%H.disconnect(): %s() waiting", this, action );
token.waitForCompletion();
}
Log.d( TAG, "%H.disconnect(): %s() succeeded", this, action );
} catch ( MqttException mex ) {
Log.e( TAG, "%H.disconnect(): %s(): got mex %s",
this, action, mex );
} catch ( Exception ex ) {
Log.e( TAG, "%H.disconnect(): %s(): got ex %s",
this, action, ex );
}
}
startDisconThread( client );
}
// Make sure we don't need to call clearInstance(this)
@ -496,6 +459,49 @@ public class MQTTUtils extends Thread
Log.d( TAG, "%H.disconnect() DONE", this );
}
private void startDisconThread( final MqttAsyncClient client )
{
new Thread( new Runnable() {
@Override
public void run() {
outer:
for ( int ii = 0; ; ++ii ) {
String action = null;
IMqttToken token = null;
try {
switch ( ii ) {
case 0:
action = "unsubscribe";
token = client.unsubscribe( mDevID );
break; // not continue, which skips the Log() below
case 1:
action = "disconnect";
token = client.disconnect();
break;
case 2:
action = "close";
client.close();
break;
default:
break outer;
}
if ( null != token ) {
Log.d( TAG, "%H.disconnect(): %s() waiting", this, action );
token.waitForCompletion();
}
Log.d( TAG, "%H.disconnect(): %s() succeeded", this, action );
} catch ( MqttException mex ) {
Log.e( TAG, "%H.disconnect(): %s(): got mex %s",
this, action, mex );
} catch ( Exception ex ) {
Log.e( TAG, "%H.disconnect(): %s(): got ex %s",
this, action, ex );
}
}
}
} ).start();
}
private void clearInstance()
{
Log.d( TAG, "%H.clearInstance()", this );