diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle index 1d7d06ee9..5e87df290 100644 --- a/xwords4/android/app/build.gradle +++ b/xwords4/android/app/build.gradle @@ -103,7 +103,6 @@ android { buildConfigField "boolean", "OFFER_MQTT", "true" buildConfigField "boolean", "NON_RELEASE", "DEBUG || !IS_TAGGED_BUILD" buildConfigField "boolean", "HAVE_KNOWN_PLAYERS", "false" - buildConfigField "boolean", "DO_MQTT_GAME_GONE", "true" buildConfigField "boolean", "FOR_FDROID", "false" } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java index 73fe9324a..983b14405 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java @@ -477,13 +477,9 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba public static void gameDied( Context context, String devID, int gameID ) { - if ( BuildConfig.DO_MQTT_GAME_GONE ) { - String[] topic = { devID }; - byte[] packet = XwJNI.dvc_makeMQTTNoSuchGame( gameID, topic ); - addToSendQueue( context, topic[0], packet ); - } else { - Log.e( TAG, "gameDied() not handled" ); // fix me - } + String[] topic = { devID }; + byte[] packet = XwJNI.dvc_makeMQTTNoSuchGame( gameID, topic ); + addToSendQueue( context, topic[0], packet ); } @Override @@ -606,16 +602,12 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba public static void handleGameGone( Context context, CommsAddrRec from, int gameID ) { - if ( BuildConfig.DO_MQTT_GAME_GONE ) { - String player = XwJNI.kplr_nameForMqttDev( from.mqtt_devID ); - ConnExpl expl = null == player ? null - : new ConnExpl( CommsConnType.COMMS_CONN_MQTT, player ); - new MQTTServiceHelper( context, from ) - .postEvent( MultiService.MultiEvent.MESSAGE_NOGAME, gameID, - expl ); - } else { - Log.d( TAG, "not posting game-gone for now (gameID: %d)" , gameID ); - } + String player = XwJNI.kplr_nameForMqttDev( from.mqtt_devID ); + ConnExpl expl = null == player ? null + : new ConnExpl( CommsConnType.COMMS_CONN_MQTT, player ); + new MQTTServiceHelper( context, from ) + .postEvent( MultiService.MultiEvent.MESSAGE_NOGAME, gameID, + expl ); } public static void fcmConfirmed( Context context, boolean working )