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

Fix app installing issue in multiple times

See merge request entgra/carbon-device-mgt!327
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit a758050660

@ -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());

Loading…
Cancel
Save