From 8f6b65946a79dba355b82d43dbc9b72e3932e6f1 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Thu, 22 Feb 2018 13:05:00 +0530
Subject: [PATCH] Correcting wrong logic for retrieving apps in appm

---
 .../osgiconnector/ApplicationOperationsImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
index f35823785..6f88b04cc 100644
--- a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
+++ b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
@@ -256,11 +256,15 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
                         .getDeviceManagementService(applicationOperationDevice.getTenantId()).
                                 getDevicesOfUser(applicationOperationDevice.getCurrentUser().getUsername());
             } else {
-                deviceList = MDMServiceAPIUtils
-                        .getDeviceManagementService(applicationOperationDevice.getTenantId()).
-                                getDevicesOfUser(applicationOperationDevice.getCurrentUser().getUsername(),
-                                        applicationOperationDevice.getPlatform());
-            }
+				deviceList = MDMServiceAPIUtils
+						.getDeviceManagementService(applicationOperationDevice.getTenantId()).
+								getDevicesOfUser(applicationOperationDevice.getCurrentUser().getUsername(),
+										MDMAppConstants.ANDROID);
+				deviceList.addAll(MDMServiceAPIUtils
+						.getDeviceManagementService(applicationOperationDevice.getTenantId()).
+								getDevicesOfUser(applicationOperationDevice.getCurrentUser().getUsername(),
+										MDMAppConstants.IOS));
+			}
             devices = new ArrayList<>(deviceList.size());
 			if(log.isDebugEnabled()){
 				log.debug("device list got from mdm "+ deviceList.toString());