turcy
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor formatting fixes

Browse Source
revert-dabc3590
inoshperera 5 years ago
parent e91a7b7e52
commit a5008504ee
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

10
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/AndroidEnterpriseServiceImpl.java
Unescape View File

@ -821,7 +821,7 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
// Extract the device identifiers of enterprise devices. // Extract the device identifiers of enterprise devices.
List<String> deviceID = new ArrayList<>(); List<String> deviceID = new ArrayList<>();
if (androidEnterpriseUsers != null && androidEnterpriseUsers.size() > 0) { if (androidEnterpriseUsers != null && !androidEnterpriseUsers.isEmpty()) {
for (AndroidEnterpriseUser userDevice: androidEnterpriseUsers) { for (AndroidEnterpriseUser userDevice: androidEnterpriseUsers) {
deviceID.add(userDevice.getEmmDeviceId()); deviceID.add(userDevice.getEmmDeviceId());
} }
@ -834,7 +834,7 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, false); getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, false);
for (Device device : devices) { // Go through all enrolled devices for (Device device : devices) { // Go through all enrolled devices
if (deviceID.contains(device.getDeviceIdentifier())) { // Filter out only enterprise enrolled devices. if (deviceID.contains(device.getDeviceIdentifier())) { // Filter out only enterprise enrolled devices.
if (device.getEnrolmentInfo().getOwnership().equals(EnrolmentInfo.OwnerShip.BYOD)) { if (EnrolmentInfo.OwnerShip.BYOD.equals(device.getEnrolmentInfo().getOwnership())) {
byodDevices.add(device.getDeviceIdentifier()); byodDevices.add(device.getDeviceIdentifier());
} else { } else {
copeDevices.add(device.getDeviceIdentifier()); copeDevices.add(device.getDeviceIdentifier());
@ -845,7 +845,7 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
CommandOperation operation = new CommandOperation(); CommandOperation operation = new CommandOperation();
operation.setType(Operation.Type.COMMAND);//TODO: Check if this should be profile operation.setType(Operation.Type.COMMAND);//TODO: Check if this should be profile
// type when implementing COPE/COSU // type when implementing COPE/COSU
if (byodDevices != null && byodDevices.size() > 0) { // BYOD devices only needs a data wipe(work profile) if (byodDevices != null && !byodDevices.isEmpty()) { // BYOD devices only needs a data wipe(work profile)
log.warn("Wiping " + byodDevices.size() + " BYOD devices"); log.warn("Wiping " + byodDevices.size() + " BYOD devices");
operation.setCode(AndroidConstants.OperationCodes.ENTERPRISE_WIPE); operation.setCode(AndroidConstants.OperationCodes.ENTERPRISE_WIPE);
} else if (copeDevices != null && copeDevices.size() > 0) { } else if (copeDevices != null && copeDevices.size() > 0) {
@ -856,8 +856,10 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
log.warn("Added wipe to all devices"); log.warn("Added wipe to all devices");
return Response.status(Response.Status.OK).build(); return Response.status(Response.Status.OK).build();
} catch (EnterpriseServiceException e) { } catch (EnterpriseServiceException e) {
String errorMessage = "Error when saving configs for enterprise " + enterpriseConfigs.getEnterpriseId();
log.error(errorMessage);
return Response.serverError().entity( return Response.serverError().entity(
new ErrorResponse.ErrorResponseBuilder().setMessage("Error when saving configs").build()).build(); new ErrorResponse.ErrorResponseBuilder().setMessage(errorMessage).build()).build();
} catch (OperationManagementException e) { } catch (OperationManagementException e) {
String errorMessage = "Could not add wipe command to enterprise " + enterpriseConfigs.getEnterpriseId(); String errorMessage = "Could not add wipe command to enterprise " + enterpriseConfigs.getEnterpriseId();
log.error(errorMessage); log.error(errorMessage);

Write Preview
Loading…
Cancel
Save