From 35d920764e67d5f2ad5cbd666816f46962b1e192 Mon Sep 17 00:00:00 2001 From: Rafa Hernandez Date: Mon, 26 Mar 2018 13:54:25 -0400 Subject: [PATCH] feat(feedback): send status for task id on disable bluetooth Signed-off-by: Rafa Hernandez --- .../java/org/flyve/mdm/agent/services/MQTTService.java | 5 +---- .../org/flyve/mdm/agent/services/PoliciesController.java | 8 +++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/flyve/mdm/agent/services/MQTTService.java b/app/src/main/java/org/flyve/mdm/agent/services/MQTTService.java index 260d1b337f..710f115c4b 100644 --- a/app/src/main/java/org/flyve/mdm/agent/services/MQTTService.java +++ b/app/src/main/java/org/flyve/mdm/agent/services/MQTTService.java @@ -694,11 +694,8 @@ public void messageArrived(String topic, MqttMessage message) throws Exception { Boolean disable = jsonObj.getBoolean(DISABLE_BLUETOOTH); String taskId = jsonObj.getString("taskId"); - // return the status of the task - policiesController.sendTaskStatus(taskId, FEEDBACK_RECEIVED); - // execute the policy - policiesController.disableBluetooth(disable); + policiesController.disableBluetooth(taskId, disable); } } catch (Exception ex) { FlyveLog.e(ex.getMessage()); diff --git a/app/src/main/java/org/flyve/mdm/agent/services/PoliciesController.java b/app/src/main/java/org/flyve/mdm/agent/services/PoliciesController.java index 3c2c4fbb8a..5e914ad3ab 100644 --- a/app/src/main/java/org/flyve/mdm/agent/services/PoliciesController.java +++ b/app/src/main/java/org/flyve/mdm/agent/services/PoliciesController.java @@ -277,13 +277,19 @@ public void disableUI(JSONObject json) { } } - public void disableBluetooth(boolean disable) { + public void disableBluetooth(String taskId, boolean disable) { try { cache.setConnectivityBluetoothDisable(disable); PoliciesConnectivity.disableBluetooth(disable); broadcastReceivedLog(Helpers.broadCastMessage(MQTT_SEND, "Bluetooth", "Bluetooth is disable: " + disable)); + + // return the status of the task + sendTaskStatus(taskId, FEEDBACK_DONE); } catch (Exception ex) { broadcastReceivedLog(Helpers.broadCastMessage(ERROR, "Error on Bluetooth", ex.getMessage())); + + // return the status of the task + sendTaskStatus(taskId, FEEDBACK_FAILED); } }