Browse Source

fixed default value for androidEnabled and iosEnabled params

pull/11835/head
dashevchenko 2 years ago
parent
commit
7398508c35
  1. 7
      application/src/test/java/org/thingsboard/server/controller/QrCodeSettingsControllerTest.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java

7
application/src/test/java/org/thingsboard/server/controller/QrCodeSettingsControllerTest.java

@ -248,10 +248,15 @@ public class QrCodeSettingsControllerTest extends AbstractControllerTest {
private MobileApp validMobileApp(String mobileAppName, PlatformType platformType) { private MobileApp validMobileApp(String mobileAppName, PlatformType platformType) {
MobileApp mobileApp = new MobileApp(); MobileApp mobileApp = new MobileApp();
mobileApp.setTenantId(tenantId); mobileApp.setTenantId(tenantId);
mobileApp.setStatus(MobileAppStatus.DRAFT); mobileApp.setStatus(MobileAppStatus.PUBLISHED);
mobileApp.setPkgName(mobileAppName); mobileApp.setPkgName(mobileAppName);
mobileApp.setPlatformType(platformType); mobileApp.setPlatformType(platformType);
mobileApp.setAppSecret(StringUtils.randomAlphanumeric(24)); mobileApp.setAppSecret(StringUtils.randomAlphanumeric(24));
StoreInfo storeInfo = StoreInfo.builder()
.storeLink("https://play.google/test")
.sha256CertFingerprints(ANDROID_APP_SHA256)
.appId("test.app.id").build();
mobileApp.setStoreInfo(storeInfo);
return mobileApp; return mobileApp;
} }
} }

2
dao/src/main/java/org/thingsboard/server/dao/mobile/QrCodeSettingServiceImpl.java

@ -100,6 +100,8 @@ public class QrCodeSettingServiceImpl extends AbstractCachedEntityService<Tenant
if (qrCodeSettings == null) { if (qrCodeSettings == null) {
qrCodeSettings = new QrCodeSettings(); qrCodeSettings = new QrCodeSettings();
qrCodeSettings.setUseDefaultApp(true); qrCodeSettings.setUseDefaultApp(true);
qrCodeSettings.setAndroidEnabled(true);
qrCodeSettings.setIosEnabled(true);
QRCodeConfig qrCodeConfig = QRCodeConfig.builder() QRCodeConfig qrCodeConfig = QRCodeConfig.builder()
.showOnHomePage(true) .showOnHomePage(true)

Loading…
Cancel
Save