From e0c15be8708c6b7a84a6dd4c5b935f2fc3dbf688 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Thu, 5 Dec 2019 07:15:52 +0530
Subject: [PATCH] Improve Android enterprise app install

---
 .../mdm/services/android/util/AndroidEnterpriseUtils.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidEnterpriseUtils.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidEnterpriseUtils.java
index d0d88d1fa..6bd4e0be8 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidEnterpriseUtils.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidEnterpriseUtils.java
@@ -282,11 +282,8 @@ public class AndroidEnterpriseUtils {
         if (productListResponse != null && productListResponse.getProduct() != null
                 && !productListResponse.getProduct().isEmpty()) {
 
-            List<String> packageNamesOfApps = new ArrayList<>();
-            for (Product product1 : productListResponse.getProduct()) {
-                String s = (product1.getProductId().replaceFirst("app:", ""));
-                packageNamesOfApps.add(s);
-            }
+            List<String> packageNamesOfApps = productListResponse.getProduct().stream()
+                    .map(product -> (product.getProductId().replaceFirst("app:", ""))).collect(Collectors.toList());
 
             List<Application> existingApps = applicationManager.getApplications(packageNamesOfApps);
             List<Product> products = productListResponse.getProduct();