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

Fix app installing issue in multiple times

See merge request entgra/carbon-device-mgt!327

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java

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