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

don't shut down MQTT levels we didn't reach

Browse source 
This is a shot-in-the-dark at internal MQTT crashes being reported
through the Play Store.
This commit is contained in:
Eric House 2022-08-06 16:09:08 -07:00
parent 37b5f80e05
commit 97f280a6ea
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -297,6 +297,7 @@ public class MQTTUtils extends Thread
if ( !stateOk ) { if ( !stateOk ) {
Log.e( TAG, "%H.setState(): bad state for %s: %s", this, newState, mState ); Log.e( TAG, "%H.setState(): bad state for %s: %s", this, newState, mState );
Assert.failDbg();
} }
} }
@ -434,6 +435,7 @@ public class MQTTUtils extends Thread
mShouldExit = true; mShouldExit = true;
State prevState = mState;
setState( State.CLOSING ); setState( State.CLOSING );
MqttAsyncClient client; MqttAsyncClient client;
@ -449,7 +451,7 @@ public class MQTTUtils extends Thread
if ( null == client ) { if ( null == client ) {
Log.e( TAG, "disconnect(): null client" ); Log.e( TAG, "disconnect(): null client" );
} else { } else {
startDisconThread( client ); startDisconThread( client, prevState );
} }
// Make sure we don't need to call clearInstance(this) // Make sure we don't need to call clearInstance(this)
@ -459,7 +461,7 @@ public class MQTTUtils extends Thread
Log.d( TAG, "%H.disconnect() DONE", this ); Log.d( TAG, "%H.disconnect() DONE", this );
} }
private void startDisconThread( final MqttAsyncClient client ) private void startDisconThread( final MqttAsyncClient client, State maxState )
{ {
new Thread( new Runnable() { new Thread( new Runnable() {
@Override @Override
@ -471,12 +473,16 @@ public class MQTTUtils extends Thread
try { try {
switch ( ii ) { switch ( ii ) {
case 0: case 0:
action = "unsubscribe"; if ( State.SUBSCRIBED == maxState ) {
token = client.unsubscribe( mDevID ); action = "unsubscribe";
token = client.unsubscribe( mDevID );
}
break; // not continue, which skips the Log() below break; // not continue, which skips the Log() below
case 1: case 1:
action = "disconnect"; if ( client.isConnected() ) {
token = client.disconnect(); action = "disconnect";
token = client.disconnect();
}
break; break;
case 2: case 2:
action = "close"; action = "close";