|
|
@ -234,12 +234,21 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
|
|
|
|
throws MobileApplicationException {
|
|
|
|
throws MobileApplicationException {
|
|
|
|
|
|
|
|
|
|
|
|
List<Device> devices;
|
|
|
|
List<Device> devices;
|
|
|
|
|
|
|
|
List<org.wso2.carbon.device.mgt.common.Device> deviceList = null;
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
List<org.wso2.carbon.device.mgt.common.Device> deviceList = MDMServiceAPIUtils
|
|
|
|
if(MDMAppConstants.WEBAPP.equals
|
|
|
|
.getDeviceManagementService(applicationOperationDevice.getTenantId()).
|
|
|
|
(applicationOperationDevice.getPlatform())) {
|
|
|
|
getDevicesOfUser(
|
|
|
|
deviceList = MDMServiceAPIUtils
|
|
|
|
applicationOperationDevice.getCurrentUser().getUsername(),
|
|
|
|
.getDeviceManagementService(applicationOperationDevice.getTenantId()).
|
|
|
|
applicationOperationDevice.getPlatform());
|
|
|
|
getDevicesOfUser(
|
|
|
|
|
|
|
|
applicationOperationDevice.getCurrentUser().getUsername());
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
deviceList = MDMServiceAPIUtils
|
|
|
|
|
|
|
|
.getDeviceManagementService(applicationOperationDevice.getTenantId()).
|
|
|
|
|
|
|
|
getDevicesOfUser(
|
|
|
|
|
|
|
|
applicationOperationDevice.getCurrentUser().getUsername(),
|
|
|
|
|
|
|
|
applicationOperationDevice.getPlatform());
|
|
|
|
|
|
|
|
}
|
|
|
|
devices = new ArrayList<>(deviceList.size());
|
|
|
|
devices = new ArrayList<>(deviceList.size());
|
|
|
|
if(log.isDebugEnabled()){
|
|
|
|
if(log.isDebugEnabled()){
|
|
|
|
log.debug("device list got from mdm "+ deviceList.toString());
|
|
|
|
log.debug("device list got from mdm "+ deviceList.toString());
|
|
|
|