dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed qr code settings

Browse Source
This commit is contained in:
dashevchenko 2024-10-31 18:38:39 +02:00
parent 21172a6195
commit 12ad7a50e6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dao/src/main/java/org/thingsboard/server/dao/service/validator/QrCodeSettingsDataValidator.java
View File

@ -43,17 +43,18 @@ public class QrCodeSettingsDataValidator extends DataValidator<QrCodeSettings> {
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()) {
if (qrCodeSettings.isAndroidEnabled()) {
MobileApp androidApp = mobileAppDao.findByBundleIdAndPlatformType(tenantId, mobileAppBundleId, PlatformType.ANDROID); MobileApp androidApp = mobileAppDao.findByBundleIdAndPlatformType(tenantId, mobileAppBundleId, PlatformType.ANDROID);
StoreInfo androidStoreInfo = androidApp.getStoreInfo(); if (androidApp != null && androidApp.getStoreInfo() == null) {
if (androidStoreInfo == 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! ");
} }
} }
} }
} }
}