From 9c34babe972869162ded575f40fde315f0bc4085 Mon Sep 17 00:00:00 2001
From: sandarudr <sandarudr@gmail.com>
Date: Mon, 9 Dec 2019 12:00:00 +0530
Subject: [PATCH] Add UI changes to enroll COPE using QR code

---
 .../configuration.hbs                                           | 1 +
 .../public/js/type-view.js                                      | 2 +-
 .../units/cdmf.unit.device.type.android.type-view/type-view.hbs | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
index 84e23a02b7..b8d938e311 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
@@ -166,6 +166,7 @@
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                     </span>
                     <br>
+                    ( ex: www.abc.com:8280 )
 
                 </label>
                 <input id="android-kiosk-config-server-ip" type="text" class="form-control" >
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js
index 16816e7ec4..89c474f589 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js
@@ -108,7 +108,7 @@ function generateKIOSKQRCode(qrCodeClass) {
         function(data) {
             data = JSON.parse(data);
             if (data != null && data.configuration != null) {
-                if (ownership_type == "COSU") {
+                if (ownership_type == "COSU" || ownership_type == "COPE") {
                     for (var i = 0; i < data.configuration.length; i++) {
                         var config = data.configuration[i];
                         if (config.name === kioskConfigs["adminComponentName"]) {
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
index 105b7ea03a..b034fb541f 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
@@ -85,7 +85,7 @@
     <hr>
     <h3>Step 02 - Enroll the Android Agent.</h3><br>
         <p>Your device can be enrolled with Entgra IoTS automatically via QR code or manually by a wizard.
-            To enroll automatically; first download agent as mentioned in Step 1 then proceed with the ENROLL WITH QR option from the device setup activity.
+            To enroll automatically, first download and install the agent as mentioned in Step 1 then proceed with the ENROLL WITH QR option from the device setup activity.
             Thereafter select the ownership configuration and scan the generated QR to complete the process.
             To enroll manually; select the Manual enrollment option from the setup activity and follow the succeeding steps.</p>
         <br>