From f7609b3ada1bf02165856fd92d60cda74606809f Mon Sep 17 00:00:00 2001
From: Milan Perera <milan@wso2.com>
Date: Sat, 2 Feb 2019 20:21:47 +0530
Subject: [PATCH] Fix qr code enrollment issues

---
 .../configuration.hbs                         | 33 +++++++++----------
 .../public/js/platform-configuration.js       | 26 +++++++--------
 .../public/js/type-view.js                    |  6 ++--
 3 files changed, 33 insertions(+), 32 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 d37490287..ec06c25f6 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
@@ -80,55 +80,55 @@
 
         <div class="kiosk-inputs">
             <div class="wr-input-control">
-                <label class="wr-input-label" for="android-kiosk-config-1">
+                <label class="wr-input-label" for="android-kiosk-config-admin-component">
                     PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME
                     <!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
                     <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
                     <!--</span>-->
                     <br>
-                    ( ex: com.emm.android/com.emm.android.DeviceAdminReceiver )
+                    ( ex: org.wso2.iot.agent/org.wso2.iot.agent.services.AgentDeviceAdminReceiver )
                 </label>
-                <input id="android-kiosk-config-1" type="text" class="form-control" >
+                <input id="android-kiosk-config-admin-component" type="text" class="form-control" >
             </div>
 
             <div class="wr-input-control">
-                <label class="wr-input-label" for="android-kiosk-config-2">
-                    PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM
+                <label class="wr-input-label" for="android-kiosk-config-checksum">
+                    PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM
                     <!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
                     <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
                     <!--</span>-->
                     <br>
                     ( ex: gJD2YwtOiWJHkSMkkIfLRlj-quNqG1fb6v100QmzM9w= )
                 </label>
-                <input id="android-kiosk-config-2" type="text" class="form-control" >
+                <input id="android-kiosk-config-checksum" type="text" class="form-control" >
             </div>
 
             <div class="wr-input-control">
-                <label class="wr-input-label" for="android-kiosk-config-3">
+                <label class="wr-input-label" for="android-kiosk-config-download-url">
                     PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION
                     <!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
                     <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
                     <!--</span>-->
                     <br>
-                    ( ex: com.emm.android/com.emm.android.DeviceAdminReceiver )
+                    ( ex: http://192.168.8.20:8080/android.apk )
                 </label>
-                <input id="android-kiosk-config-3" type="text" class="form-control" >
+                <input id="android-kiosk-config-download-url" type="text" class="form-control" >
             </div>
 
             <div class="wr-input-control">
-                <label class="wr-input-label" for="android-kiosk-config-4">
+                <label class="wr-input-label" for="android-kiosk-config-wifi-ssid">
                     PROVISIONING_WIFI_SSID
                     <!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
                     <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
                     <!--</span>-->
                     <br>
-                    ( ex: GuestWiFi )
+                    ( ex: Entgra )
                 </label>
-                <input id="android-kiosk-config-4" type="text" class="form-control" >
+                <input id="android-kiosk-config-wifi-ssid" type="text" class="form-control" >
             </div>
 
             <div class="wr-input-control">
-                <label class="wr-input-label" for="android-kiosk-config-5">
+                <label class="wr-input-label" for="android-kiosk-config-wifi-password">
                     PROVISIONING_WIFI_PASSWORD
                     <!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
                     <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
@@ -136,19 +136,18 @@
                     <br>
 
                 </label>
-                <input id="android-kiosk-config-5" type="text" class="form-control" >
+                <input id="android-kiosk-config-wifi-password" type="text" class="form-control" >
             </div>
 
             <div class="wr-input-control">
-                <label class="wr-input-label" for="android-kiosk-config-6">
+                <label class="wr-input-label" for="android-kiosk-config-encryption">
                     PROVISIONING_SKIP_ENCRYPTION
                     <!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
                     <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
                     <!--</span>-->
                     <br>
-                    ( ex: gJD2YwtOiWJHkSMkkIfLRlj-quNqG1fb6v100QmzM9w= )
                 </label>
-                <select id="android-kiosk-config-6" class="form-control" data-default="0">
+                <select id="android-kiosk-config-encryption" class="form-control" data-default="0">
                     <option value="false">false</option>
                     <option value="true">true</option>
                 </select>
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/public/js/platform-configuration.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.platform.configuration/public/js/platform-configuration.js
index f95947189..e204ef96a 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/public/js/platform-configuration.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.platform.configuration/public/js/platform-configuration.js
@@ -85,7 +85,7 @@ var kioskConfigs = {
     "wifiSSID" : "android.app.extra.PROVISIONING_WIFI_SSID",
     "wifiPassword" : "android.app.extra.PROVISIONING_WIFI_PASSWORD",
     "skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION",
-    "checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM",
+    "checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM",
     "downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION"
 };
 
@@ -136,17 +136,17 @@ $(document).ready(function () {
                     } else if (config.name === configParams["ANDROID_EULA"]) {
                         $("#android-eula").val(config.value);
                     } else if (config.name === kioskConfigs["adminComponentName"]) {
-                        $("input#android-kiosk-config-1").val(config.value);
+                        $("input#android-kiosk-config-admin-component").val(config.value);
                     } else if (config.name === kioskConfigs["wifiSSID"]) {
-                        $("input#android-kiosk-config-2").val(config.value);
+                        $("input#android-kiosk-config-wifi-ssid").val(config.value);
                     } else if (config.name === kioskConfigs["wifiPassword"]) {
-                        $("input#android-kiosk-config-3").val(config.value);
+                        $("input#android-kiosk-config-wifi-password").val(config.value);
                     } else if (config.name === kioskConfigs["checksum"]) {
-                        $("input#android-kiosk-config-4").val(config.value);
+                        $("input#android-kiosk-config-checksum").val(config.value);
                     } else if (config.name === kioskConfigs["downloadURL"]) {
-                        $("input#android-kiosk-config-5").val(config.value);
+                        $("input#android-kiosk-config-download-url").val(config.value);
                     } else if (config.name === kioskConfigs["skipEncryption"]) {
-                        $("#android-kiosk-config-6").val(config.value);
+                        $("#android-kiosk-config-encryption").val(config.value);
                     }
                 }
             }
@@ -184,12 +184,12 @@ $(document).ready(function () {
         var errorMsg = "#android-config-error-msg span";
 
         // KIOSK configs
-        var adminComponentName = $("input#android-kiosk-config-1").val();
-        var checksum = $("input#android-kiosk-config-2").val();
-        var downloadUrl = $("input#android-kiosk-config-3").val();
-        var wifiSSID = $("input#android-kiosk-config-4").val();
-        var wifiPassword = $("input#android-kiosk-config-5").val();
-        var encryption = $("#android-kiosk-config-6").find("option:selected").attr("value");
+        var adminComponentName = $("input#android-kiosk-config-admin-component").val();
+        var checksum = $("input#android-kiosk-config-checksum").val();
+        var downloadUrl = $("input#android-kiosk-config-download-url").val();
+        var wifiSSID = $("input#android-kiosk-config-wifi-ssid").val();
+        var wifiPassword = $("input#android-kiosk-config-wifi-password").val();
+        var encryption = $("#android-kiosk-config-encryption").find("option:selected").attr("value");
 
         if (notifierType === notifierTypeConstants["LOCAL"] && !notifierFrequency) {
             $(errorMsg).text("Notifier frequency is a required field. It cannot be empty.");
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 672d0b112..33740e0be 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
@@ -36,8 +36,10 @@ var kioskConfigs = {
     "wifiSSID" : "android.app.extra.PROVISIONING_WIFI_SSID",
     "wifiPassword" : "android.app.extra.PROVISIONING_WIFI_PASSWORD",
     "skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION",
-    "checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM",
-    "downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION"
+    "checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM",
+    "downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION",
+    "androidExtra" : "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE",
+    "accessToken" : "android.app.extra.token"
 };
 
 /*