Fix app name validation issue for webclip

4.x.x
shamalka 5 years ago
parent d34f1caf41
commit e1a5ae1164

@ -1894,16 +1894,23 @@ public class ApplicationManagerImpl implements ApplicationManager {
DeviceManagementProviderService deviceManagementProviderService = DataHolder.getInstance() DeviceManagementProviderService deviceManagementProviderService = DataHolder.getInstance()
.getDeviceManagementService(); .getDeviceManagementService();
try { try {
int deviceTypeId;
if (!deviceTypeName.equals(Constants.ALL)) {
DeviceType deviceType = deviceManagementProviderService.getDeviceType(deviceTypeName); DeviceType deviceType = deviceManagementProviderService.getDeviceType(deviceTypeName);
deviceTypeId = deviceType.getId();
if (deviceType == null) { if (deviceType == null) {
String msg = "Device type doesn't exist. Hence check the application name existence with valid " String msg = "Device type doesn't exist. Hence check the application name existence with valid "
+ "device type name."; + "device type name.";
log.error(msg); log.error(msg);
throw new BadRequestException(msg); throw new BadRequestException(msg);
} }
} else {
//For web-clips device type = 'ALL'
deviceTypeId = 0;
}
try { try {
ConnectionManagerUtil.openDBConnection(); ConnectionManagerUtil.openDBConnection();
if (applicationDAO.isExistingAppName(appName, deviceType.getId(), tenantId)) { if (applicationDAO.isExistingAppName(appName, deviceTypeId, tenantId)) {
return true; return true;
} }
} catch (DBConnectionException e) { } catch (DBConnectionException e) {

@ -48,6 +48,7 @@ public class Constants {
public static final String FORWARD_SLASH = "/"; public static final String FORWARD_SLASH = "/";
public static final String ANY = "ANY"; public static final String ANY = "ANY";
public static final String DEFAULT_PCK_NAME = "default.app.com"; public static final String DEFAULT_PCK_NAME = "default.app.com";
public static final String ALL = "ALL";
public static final String GOOGLE_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id="; public static final String GOOGLE_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=";
public static final String APPLE_STORE_URL = "https://itunes.apple.com/country/app/app-name/id"; public static final String APPLE_STORE_URL = "https://itunes.apple.com/country/app/app-name/id";

Loading…
Cancel
Save