Merge pull request #871 from rasika/fix-1611

Changing Geo Location Enabling Configuration
revert-dabc3590
Rasika Perera 7 years ago committed by GitHub
commit 0adfde9056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -39,7 +39,7 @@ function onRequest(context) {
viewObject.anchor = encodeURI(JSON.stringify(anchor)); viewObject.anchor = encodeURI(JSON.stringify(anchor));
viewObject.locationHistory = stringify(device.content.locationHistory); viewObject.locationHistory = stringify(device.content.locationHistory);
viewObject.locationEnabled = (device.content.locationHistory.length !== 0); viewObject.locationEnabled = (device.content.locationHistory.length !== 0);
viewObject.geoServicesEnabled = devicemgtProps.serverConfig.operationAnalyticsConfiguration.isEnabled; viewObject.geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.enabled;
return viewObject; return viewObject;
} else { } else {
response.sendError(404, "Device Id " + deviceId + " of type " + deviceType + " cannot be found!"); response.sendError(404, "Device Id " + deviceId + " of type " + deviceType + " cannot be found!");

@ -70,7 +70,7 @@ public class EventReceiverServiceImpl implements EventReceiverService {
log.debug("Invoking Android device event logging."); log.debug("Invoking Android device event logging.");
} }
try { try {
if (!DeviceManagerUtil.isOperationAnalyticsEnabled()) { if (!DeviceManagerUtil.isPublishLocationResponseEnabled()) {
return Response.status(Response.Status.ACCEPTED).entity("Event is publishing has not enabled.").build(); return Response.status(Response.Status.ACCEPTED).entity("Event is publishing has not enabled.").build();
} }
DeviceIdentifier deviceIdentifier = new DeviceIdentifier(eventBeanWrapper.getDeviceIdentifier(), DeviceIdentifier deviceIdentifier = new DeviceIdentifier(eventBeanWrapper.getDeviceIdentifier(),

@ -70,7 +70,7 @@ public class EventReceiverServiceImpl implements EventReceiverService {
log.debug("Invoking Android device event logging."); log.debug("Invoking Android device event logging.");
} }
try { try {
if (!DeviceManagerUtil.isOperationAnalyticsEnabled()) { if (!DeviceManagerUtil.isPublishLocationResponseEnabled()) {
return Response.status(Response.Status.ACCEPTED).entity("Event is publishing has not enabled.").build(); return Response.status(Response.Status.ACCEPTED).entity("Event is publishing has not enabled.").build();
} }
DeviceIdentifier deviceIdentifier = new DeviceIdentifier(eventBeanWrapper.getDeviceIdentifier(), DeviceIdentifier deviceIdentifier = new DeviceIdentifier(eventBeanWrapper.getDeviceIdentifier(),

@ -1215,7 +1215,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>3.0.207</carbon.devicemgt.version> <carbon.devicemgt.version>3.0.208</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
<!-- Carbon App Management --> <!-- Carbon App Management -->

Loading…
Cancel
Save