Browse Source

deleted badge style from mobile app settings

pull/10838/head
dashevchenko 2 years ago
parent
commit
7db220e9e4
  1. 4
      application/src/main/java/org/thingsboard/server/controller/MobileApplicationController.java
  2. 1
      common/data/src/main/java/org/thingsboard/server/common/data/mobile/QRCodeConfig.java
  3. 1
      dao/src/main/java/org/thingsboard/server/dao/mobile/BaseMobileAppSettingsService.java

4
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();

1
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;

1
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();

Loading…
Cancel
Save