From 55fb35bf4441bbafbdc5786ef3cfcb9b5eef4b20 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 14 Jan 2025 14:43:15 +0200
Subject: [PATCH] fixed nullpointer for mobile app bundle id

---
 .../thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
index ee3e59c60b..27cc3eebbf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java
@@ -115,7 +115,7 @@ public class QrCodeSettingServiceImpl extends AbstractCachedEntityService<Tenant
             qrCodeSettings.setQrCodeConfig(qrCodeConfig);
             qrCodeSettings.setMobileAppBundleId(qrCodeSettings.getMobileAppBundleId());
         }
-        if (qrCodeSettings.isUseDefaultApp()) {
+        if (qrCodeSettings.isUseDefaultApp() || qrCodeSettings.getMobileAppBundleId() == null) {
             qrCodeSettings.setGooglePlayLink(googlePlayLink);
             qrCodeSettings.setAppStoreLink(appStoreLink);
         } else {