Commit c7274b6139cc509d65626fb1e986a7db1e2a8aa6

Authored by YevhenBondarenko
1 parent 7121fbf8

ota package tag improvements

@@ -146,6 +146,7 @@ public class OtaPackageController extends BaseController { @@ -146,6 +146,7 @@ public class OtaPackageController extends BaseController {
146 otaPackage.setType(info.getType()); 146 otaPackage.setType(info.getType());
147 otaPackage.setTitle(info.getTitle()); 147 otaPackage.setTitle(info.getTitle());
148 otaPackage.setVersion(info.getVersion()); 148 otaPackage.setVersion(info.getVersion());
  149 + otaPackage.setTag(info.getTag());
149 otaPackage.setAdditionalInfo(info.getAdditionalInfo()); 150 otaPackage.setAdditionalInfo(info.getAdditionalInfo());
150 151
151 ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase()); 152 ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
@@ -75,7 +75,7 @@ public abstract class LwM2MClientOtaInfo<Strategy, State, Result> { @@ -75,7 +75,7 @@ public abstract class LwM2MClientOtaInfo<Strategy, State, Result> {
75 } else if (StringUtils.isNotEmpty(targetTag) && targetTag.equals(currentPackageId)) { 75 } else if (StringUtils.isNotEmpty(targetTag) && targetTag.equals(currentPackageId)) {
76 return false; 76 return false;
77 } else if (StringUtils.isNotEmpty(currentVersion3)) { 77 } else if (StringUtils.isNotEmpty(currentVersion3)) {
78 - if (StringUtils.isNotEmpty(targetTag) && !currentVersion3.contains(targetPackageId)) { 78 + if (StringUtils.isNotEmpty(targetTag) && currentVersion3.contains(targetTag)) {
79 return false; 79 return false;
80 } 80 }
81 return !currentVersion3.contains(targetPackageId); 81 return !currentVersion3.contains(targetPackageId);