From 8953cea830e609740dada79e4f6e98fd02d75e8f Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 2 Aug 2017 13:32:33 +0530
Subject: [PATCH] Fixes to the https://github.com/wso2/product-iots/issues/1251

---
 .../device-view.hbs                                         | 6 +++++-
 .../device-view.js                                          | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index e680bf678..892d51803 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -67,7 +67,11 @@
             <div id="map-error" class="message message-warning">
                 <h4 class="remove-margin">
                     <i class="icon fw fw-warning"></i>
-                    Device location information is not available. Please check whether Geo Location Based Services is Enabled.
+                    {{#if geoServicesEnabled}}
+                    Device location information is not available.
+                    {{else}}
+                    Geo Location Based Services is not enabled.
+                    {{/if}}
                 </h4>
             </div>
             <p class="add-padding-5x"></p>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
index 4e0dbb689..438936c90 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
@@ -38,6 +38,7 @@ function onRequest(context) {
             viewObject.anchor = encodeURI(JSON.stringify(anchor));
             viewObject.locationHistory = stringify(device.content.locationHistory);
             viewObject.locationEnabled = (device.content.locationHistory.length !== 0);
+            viewObject.geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled;
             return viewObject;
         } else {
             response.sendError(404, "Device Id " + deviceId + " of type " + deviceType + " cannot be found!");