community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'subs-operation-status-fix' into 'master'

Browse Source 
Fix operation status issue in app subscription

See merge request entgra/carbon-device-mgt!818
This commit is contained in:
Pahansith Gunathilake 2021-11-22 11:14:26 +00:00
commit 26ef9bcf01
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/OperationStatusBean.java
View File

@ -44,6 +44,12 @@ public class OperationStatusBean {
) )
private String status; private String status;
@ApiModelProperty(
name = "operationCode",
value = "Operation Code."
)
private String operationCode;
public int getOperationId() { public int getOperationId() {
return operationId; return operationId;
} }
@ -59,4 +65,12 @@ public class OperationStatusBean {
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public String getOperationCode() {
return operationCode;
}
public void setOperationCode(String operationCode) {
this.operationCode = operationCode;
}
} }

1
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
View File

@ -1417,6 +1417,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
} }
Operation operation = DeviceMgtAPIUtils.validateOperationStatusBean(operationStatusBean); Operation operation = DeviceMgtAPIUtils.validateOperationStatusBean(operationStatusBean);
operation.setId(operationStatusBean.getOperationId()); operation.setId(operationStatusBean.getOperationId());
operation.setCode(operationStatusBean.getOperationCode());
DeviceMgtAPIUtils.getDeviceManagementService().updateOperation(device, operation); DeviceMgtAPIUtils.getDeviceManagementService().updateOperation(device, operation);
if (MDMAppConstants.AndroidConstants.OPCODE_INSTALL_APPLICATION.equals(operation.getCode()) || if (MDMAppConstants.AndroidConstants.OPCODE_INSTALL_APPLICATION.equals(operation.getCode()) ||