From 7db220e9e4ed7abe164f2a1b34ddc7f46df34e06 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Mon, 27 May 2024 12:36:05 +0300
Subject: [PATCH] deleted badge style from mobile app settings

---
 .../server/controller/MobileApplicationController.java        | 4 ++--
 .../thingsboard/server/common/data/mobile/QRCodeConfig.java   | 1 -
 .../server/dao/mobile/BaseMobileAppSettingsService.java       | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/MobileApplicationController.java b/application/src/main/java/org/thingsboard/server/controller/MobileApplicationController.java
index 626f6f3b0f..77e34fc18c 100644
--- a/application/src/main/java/org/thingsboard/server/controller/MobileApplicationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/MobileApplicationController.java
@@ -97,7 +97,7 @@ public class MobileApplicationController extends BaseController {
     public ResponseEntity<JsonNode> getAssetLinks() {
         MobileAppSettings mobileAppSettings = mobileAppSettingsService.getMobileAppSettings(TenantId.SYS_TENANT_ID);
         AndroidConfig androidConfig = mobileAppSettings.getAndroidConfig();
-        if (androidConfig != null && androidConfig.isEnabled() && !androidConfig.getAppPackage().isBlank() && !androidConfig.getSha256CertFingerprints().isBlank()) {
+        if (androidConfig != null && androidConfig.isEnabled() && androidConfig.getAppPackage() != null && androidConfig.getSha256CertFingerprints() != null) {
             return ResponseEntity.ok(JacksonUtil.toJsonNode(String.format(ASSET_LINKS_PATTERN, androidConfig.getAppPackage(), androidConfig.getSha256CertFingerprints())));
         } else {
             return ResponseEntity.notFound().build();
@@ -109,7 +109,7 @@ public class MobileApplicationController extends BaseController {
     public ResponseEntity<JsonNode> getAppleAppSiteAssociation() {
         MobileAppSettings mobileAppSettings = mobileAppSettingsService.getMobileAppSettings(TenantId.SYS_TENANT_ID);
         IosConfig iosConfig = mobileAppSettings.getIosConfig();
-        if (iosConfig != null && iosConfig.isEnabled() && !iosConfig.getAppId().isBlank()) {
+        if (iosConfig != null && iosConfig.isEnabled() && iosConfig.getAppId() != null) {
             return ResponseEntity.ok(JacksonUtil.toJsonNode(String.format(APPLE_APP_SITE_ASSOCIATION_PATTERN, iosConfig.getAppId())));
         } else {
             return ResponseEntity.notFound().build();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/QRCodeConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/QRCodeConfig.java
index b3f975870e..8bc9b23481 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/QRCodeConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/QRCodeConfig.java
@@ -33,7 +33,6 @@ public class QRCodeConfig {
     private boolean badgeEnabled;
     private boolean qrCodeLabelEnabled;
     private BadgePosition badgePosition;
-    private BadgeStyle badgeStyle;
     @NoXss
     private String qrCodeLabel;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/mobile/BaseMobileAppSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/mobile/BaseMobileAppSettingsService.java
index 4e8a2cd503..c852947ff8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/mobile/BaseMobileAppSettingsService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/mobile/BaseMobileAppSettingsService.java
@@ -98,7 +98,6 @@ public class BaseMobileAppSettingsService extends AbstractCachedEntityService<Te
                     .qrCodeLabel(DEFAULT_QR_CODE_LABEL)
                     .badgeEnabled(true)
                     .badgePosition(BadgePosition.RIGHT)
-                    .badgeStyle(BadgeStyle.ORIGINAL)
                     .badgeEnabled(true)
                     .build();