community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Handle change of device name

See merge request entgra/carbon-device-mgt!593
This commit is contained in:
Inosh Perara 2020-07-17 12:12:55 +00:00
commit 571f8f3ecb
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java
View File

@ -169,4 +169,13 @@ public final class DeviceManagementConstants {
public static final String DEVICE_INFO_PARAM = "device-info"; public static final String DEVICE_INFO_PARAM = "device-info";
public static final String APP_USAGE_ENDPOINT = REPORTING_CONTEXT + "/app-usage"; 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";;
}
} }

20
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
View File

@ -134,6 +134,20 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
deviceDetailsDAO.addDeviceProperties(injectableProps, device.getId(), deviceDetailsDAO.addDeviceProperties(injectableProps, device.getId(),
device.getEnrolmentInfo().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()); deviceDAO.updateDevice(device, CarbonContext.getThreadLocalCarbonContext().getTenantId());
DeviceManagementDAOFactory.commitTransaction(); DeviceManagementDAOFactory.commitTransaction();
@ -142,8 +156,10 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
Object[] metaData = {device.getDeviceIdentifier(), device.getType()}; Object[] metaData = {device.getDeviceIdentifier(), device.getType()};
Object[] payload = new Object[]{ Object[] payload = new Object[]{
Calendar.getInstance().getTimeInMillis(), Calendar.getInstance().getTimeInMillis(),
deviceInfo.getDeviceDetailsMap().get("IMEI"), deviceInfo.getDeviceDetailsMap().get(DeviceManagementConstants.Payload
deviceInfo.getDeviceDetailsMap().get("IMSI"), .DEVICE_INFO_IMEI),
deviceInfo.getDeviceDetailsMap().get(DeviceManagementConstants.Payload
.DEVICE_INFO_IMSI),
deviceInfo.getDeviceModel(), deviceInfo.getDeviceModel(),
deviceInfo.getVendor(), deviceInfo.getVendor(),
deviceInfo.getOsVersion(), deviceInfo.getOsVersion(),