Merge pull request #4922 from YevhenBondarenko/lwm2m-improvements

update fw/sw strategy

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java

@@ -173,6 +173,11 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
             attributesToFetch.add(SOFTWARE_VERSION);
             attributesToFetch.add(SOFTWARE_URL);
         }
+        
+        var clientSettings = clientContext.getProfile(client.getProfileId()).getClientLwM2mSettings();
+
+        onFirmwareStrategyUpdate(client, clientSettings);
+        onCurrentSoftwareStrategyUpdate(client, clientSettings);
 
         if (!attributesToFetch.isEmpty()) {
             var future = attributesService.getSharedAttributes(client, attributesToFetch);
@@ -547,7 +552,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
             if (info == null) {
                 var profile = clientContext.getProfile(client.getProfileId());
                 info = new LwM2MClientSwOtaInfo(endpoint, profile.getClientLwM2mSettings().getSwUpdateResource(),
-                        LwM2MSoftwareUpdateStrategy.fromStrategySwByCode(profile.getClientLwM2mSettings().getFwUpdateStrategy()));
+                        LwM2MSoftwareUpdateStrategy.fromStrategySwByCode(profile.getClientLwM2mSettings().getSwUpdateStrategy()));
                 update(info);
             }
             return info;