Merge pull request #811 from harshanL/master

Added new config param to fetch hostname.

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json

@@ -2,6 +2,7 @@
     "appContext" : "/android-web-agent/",
     "httpsURL" : "%https.ip%",
     "httpURL" : "%http.ip%",
+    "managerHTTPSURL": "https://%iot.manager.host%:%iot.manager.https.port%",
     "enrollmentDir": "/android-web-agent/enrollment",
     "adminService":"%https.ip%",
     "callBackUrl":"%https.ip%/mdm-admin",

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.js

@@ -25,7 +25,7 @@ function onRequest(context) {
     // setting android agent download URL
     // Needs host=>http:9763 since self-signed certificates won't allow downloads in android
     //TODO: try to retrieve page name from UUF
-    viewModel.agentDownloadURL = mdmProps["generalConfig"]["host"] + mdmProps["appContext"] + "public/mdm.page.enrollments.android.download-agent/asset/" + mdmProps["androidAgentApp"];
+    viewModel.agentDownloadURL = mdmProps["managerHTTPSURL"] + mdmProps["appContext"] + "public/mdm.page.enrollments.android.download-agent/asset/" + mdmProps["androidAgentApp"];
     var companyProps = session.get("COMPANY_DETAILS");
     if (!companyProps) {
         viewModel.companyName = mdmProps.generalConfig.companyName;