community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://gitlab.com/entgra/product-iots/issues/125

Browse Source
This commit is contained in:
inoshperera 2019-08-08 14:54:47 +05:30
parent 20a89a8105
commit c1184167df
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidDeviceUtils.java
View File

@ -238,6 +238,20 @@ public class AndroidDeviceUtils {
}
}
AndroidAPIUtils.getDeviceManagementService().updateOperation(deviceIdentifier, operation);
// This has to be bellow other if blocks, since updateOperation would fail if we execute against a disenrolled
// device.
if (!Operation.Status.ERROR.equals(operation.getStatus()) && AndroidConstants.
OperationCodes.WIPE_DATA.equals(operation.getCode())) {
if (log.isDebugEnabled()) {
log.debug("Received wipe data from device '" + deviceId + "'");
}
try {
AndroidAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
} catch (DeviceManagementException e) {
throw new OperationManagementException("Error occurred while unenrolling the device.", e);
}
}
}
public static List<? extends Operation> getPendingOperations