Merge branch 'application-mgt-new' into 'application-mgt-new'

Fix app installing issue in multiple times

See merge request entgra/carbon-device-mgt!327
This commit is contained in:
Dharmakeerthi Lasantha 2019-10-18 06:19:37 +00:00
commit a758050660

View File

@ -446,12 +446,11 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
DeviceIdentifier deviceIdentifier = new DeviceIdentifier(device.getDeviceIdentifier(), device.getType());
DeviceSubscriptionDTO deviceSubscriptionDTO = deviceSubscriptions.get(device.getId());
if (deviceSubscriptionDTO != null) {
if (deviceSubscriptionDTO.isUnsubscribed()) {
appReInstallableDevices.put(deviceIdentifier, device.getId());
}
if (!deviceSubscriptionDTO.isUnsubscribed() && Operation.Status.COMPLETED.toString()
.equals(deviceSubscriptionDTO.getStatus())) {
appInstalledDevices.put(deviceIdentifier, device.getId());
} else {
appReInstallableDevices.put(deviceIdentifier, device.getId());
}
} else {
appInstallableDevices.put(deviceIdentifier, device.getId());