Browse Source

fixed qr code settings

pull/11835/head
dashevchenko 2 years ago
parent
commit
12ad7a50e6
  1. 21
      dao/src/main/java/org/thingsboard/server/dao/service/validator/QrCodeSettingsDataValidator.java

21
dao/src/main/java/org/thingsboard/server/dao/service/validator/QrCodeSettingsDataValidator.java

@ -42,17 +42,18 @@ public class QrCodeSettingsDataValidator extends DataValidator<QrCodeSettings> {
if (!qrCodeSettings.isUseDefaultApp() && (mobileAppBundleId == null)) { if (!qrCodeSettings.isUseDefaultApp() && (mobileAppBundleId == null)) {
throw new DataValidationException("Mobile app bundle is required to use custom application!"); throw new DataValidationException("Mobile app bundle is required to use custom application!");
} }
if (!qrCodeSettings.isUseDefaultApp()){ if (!qrCodeSettings.isUseDefaultApp()) {
MobileApp androidApp = mobileAppDao.findByBundleIdAndPlatformType(tenantId, mobileAppBundleId, PlatformType.ANDROID); if (qrCodeSettings.isAndroidEnabled()) {
StoreInfo androidStoreInfo = androidApp.getStoreInfo(); MobileApp androidApp = mobileAppDao.findByBundleIdAndPlatformType(tenantId, mobileAppBundleId, PlatformType.ANDROID);
if (androidStoreInfo == null) { if (androidApp != null && androidApp.getStoreInfo() == null) {
throw new DataValidationException("Android app store info is empty! "); throw new DataValidationException("Android app store info is empty! ");
}
} }
if (qrCodeSettings.isIosEnabled()) {
MobileApp iosApp = mobileAppDao.findByBundleIdAndPlatformType(tenantId, mobileAppBundleId, PlatformType.IOS); MobileApp iosApp = mobileAppDao.findByBundleIdAndPlatformType(tenantId, mobileAppBundleId, PlatformType.IOS);
StoreInfo iosStoreInfo = iosApp.getStoreInfo(); if (iosApp != null && iosApp.getStoreInfo() == null) {
if (iosStoreInfo == null) { throw new DataValidationException("IOS app store info is empty! ");
throw new DataValidationException("IOS app store info is empty! "); }
} }
} }
} }

Loading…
Cancel
Save