community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed issue in device type config operation

Browse Source 
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
merge-requests/11/head
Charitha Goonetilleke 6 years ago
parent 9f15dc9922
commit 5bbb45ce84
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -24,6 +24,7 @@ import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
import org.wso2.carbon.device.mgt.common.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@ -124,25 +125,28 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
} else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) { } else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) {
List<Device> deviceList = AndroidAPIUtils. List<Device> deviceList = AndroidAPIUtils.
getDeviceManagementService(). getDeviceManagementService().
getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, false);
List<DeviceIdentifier> deviceIdList = new ArrayList<>(); List<DeviceIdentifier> deviceIdList = new ArrayList<>();
for (Device device : deviceList) { for (Device device : deviceList) {
deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(),device.getType())); if (EnrolmentInfo.Status.REMOVED != device.getEnrolmentInfo().getStatus()) {
deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
}
} }
if (entry.getValue() != null) { if (!deviceIdList.isEmpty()) {
NotifierFrequency notifierFrequency = new NotifierFrequency(); if (entry.getValue() != null) {
notifierFrequency.setValue(Integer.parseInt(entry.getValue().toString())); NotifierFrequency notifierFrequency = new NotifierFrequency();
ProfileOperation operation = new ProfileOperation(); notifierFrequency.setValue(Integer.parseInt(entry.getValue().toString()));
operation.setCode(AndroidConstants.OperationCodes.NOTIFIER_FREQUENCY); ProfileOperation operation = new ProfileOperation();
operation.setPayLoad(notifierFrequency.toJSON()); operation.setCode(AndroidConstants.OperationCodes.NOTIFIER_FREQUENCY);
operation.setType(Operation.Type.CONFIG); operation.setPayLoad(notifierFrequency.toJSON());
operation.setEnabled(true); operation.setEnabled(true);
AndroidAPIUtils.getDeviceManagementService().addOperation( AndroidAPIUtils.getDeviceManagementService().addOperation(
DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID,
operation, deviceIdList); operation, deviceIdList);
} else { } else {
return Response.status(Response.Status.BAD_REQUEST) return Response.status(Response.Status.BAD_REQUEST)
.entity("No value specified for notifierFrequency.").build(); .entity("No value specified for notifierFrequency.").build();
}
} }
} }
} }

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

@ -25,6 +25,7 @@ import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
import org.wso2.carbon.device.mgt.common.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@ -125,25 +126,28 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
} else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) { } else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) {
List<Device> deviceList = AndroidAPIUtils. List<Device> deviceList = AndroidAPIUtils.
getDeviceManagementService(). getDeviceManagementService().
getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, false);
List<DeviceIdentifier> deviceIdList = new ArrayList<>(); List<DeviceIdentifier> deviceIdList = new ArrayList<>();
for (Device device : deviceList) { for (Device device : deviceList) {
deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType())); if (EnrolmentInfo.Status.REMOVED != device.getEnrolmentInfo().getStatus()) {
deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
}
} }
if (entry.getValue() != null) { if (!deviceIdList.isEmpty()) {
NotifierFrequency notifierFrequency = new NotifierFrequency(); if (entry.getValue() != null) {
notifierFrequency.setValue(Integer.parseInt(entry.getValue().toString())); NotifierFrequency notifierFrequency = new NotifierFrequency();
ProfileOperation operation = new ProfileOperation(); notifierFrequency.setValue(Integer.parseInt(entry.getValue().toString()));
operation.setCode(AndroidConstants.OperationCodes.NOTIFIER_FREQUENCY); ProfileOperation operation = new ProfileOperation();
operation.setPayLoad(notifierFrequency.toJSON()); operation.setCode(AndroidConstants.OperationCodes.NOTIFIER_FREQUENCY);
operation.setType(Operation.Type.CONFIG); operation.setPayLoad(notifierFrequency.toJSON());
operation.setEnabled(true); operation.setEnabled(true);
AndroidAPIUtils.getDeviceManagementService().addOperation( AndroidAPIUtils.getDeviceManagementService().addOperation(
DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID,
operation, deviceIdList); operation, deviceIdList);
} else { } else {
return Response.status(Response.Status.BAD_REQUEST) return Response.status(Response.Status.BAD_REQUEST)
.entity("No value specified for notifierFrequency.").build(); .entity("No value specified for notifierFrequency.").build();
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save