Handle change of device name

merge-requests/593/head
inoshperera 4 years ago
parent b3f395b284
commit 43a6c710ad

@ -169,4 +169,13 @@ public final class DeviceManagementConstants {
public static final String DEVICE_INFO_PARAM = "device-info";
public static final String APP_USAGE_ENDPOINT = REPORTING_CONTEXT + "/app-usage";
}
public static final class Payload {
private Payload() {
throw new AssertionError();
}
public static final String DEVICE_INFO_DEVICE_NAME = "DEVICE_NAME";
public static final String DEVICE_INFO_IMEI = "IMEI";
public static final String DEVICE_INFO_IMSI = "IMSI";;
}
}

@ -134,6 +134,20 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
deviceDetailsDAO.addDeviceProperties(injectableProps, device.getId(),
device.getEnrolmentInfo().getId());
}
if (deviceInfo.getDeviceDetailsMap().containsKey(DeviceManagementConstants
.Payload.DEVICE_INFO_DEVICE_NAME) &&
StringUtils.isNotEmpty(deviceInfo.getDeviceDetailsMap()
.get(DeviceManagementConstants.Payload.DEVICE_INFO_DEVICE_NAME))
&& !device.getName().equals(deviceInfo.getDeviceDetailsMap()
.get(DeviceManagementConstants.Payload.DEVICE_INFO_DEVICE_NAME))) {
String name = deviceInfo.getDeviceDetailsMap()
.get(DeviceManagementConstants.Payload.DEVICE_INFO_DEVICE_NAME);
log.info("Device identifier " + device.getDeviceIdentifier() + ", Device name " +
"changed by user from " + device.getName() + " to " + name);
device.setName(name);
}
deviceDAO.updateDevice(device, CarbonContext.getThreadLocalCarbonContext().getTenantId());
DeviceManagementDAOFactory.commitTransaction();
@ -142,8 +156,10 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
Object[] metaData = {device.getDeviceIdentifier(), device.getType()};
Object[] payload = new Object[]{
Calendar.getInstance().getTimeInMillis(),
deviceInfo.getDeviceDetailsMap().get("IMEI"),
deviceInfo.getDeviceDetailsMap().get("IMSI"),
deviceInfo.getDeviceDetailsMap().get(DeviceManagementConstants.Payload
.DEVICE_INFO_IMEI),
deviceInfo.getDeviceDetailsMap().get(DeviceManagementConstants.Payload
.DEVICE_INFO_IMSI),
deviceInfo.getDeviceModel(),
deviceInfo.getVendor(),
deviceInfo.getOsVersion(),

Loading…
Cancel
Save