From 45c5703f2f5e28de8fe911cd0c8955d977f47e57 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Mon, 12 Jul 2021 12:36:50 +0300
Subject: [PATCH] eDRX cycle parameters on device level

---
 .../transport/lwm2m/server/client/LwM2mClient.java   |  4 +++-
 .../lwm2m/server/client/LwM2mClientContextImpl.java  | 12 ++++++++----
 ui-ngx/src/assets/locale/locale.constant-en_US.json  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
index 0d48ee7b7a..a191849215 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
@@ -136,7 +136,9 @@ public class LwM2mClient implements Serializable {
         builder.setDeviceName(device.getName());
         deviceProfileOpt.ifPresent(deviceProfile -> updateSession(deviceProfile, builder));
         this.session = builder.build();
-        this.powerMode = ((Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration()).getPowerMode();
+        Lwm2mDeviceTransportConfiguration transportConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
+        this.powerMode = transportConfiguration.getPowerMode();
+        this.edrxCycle = transportConfiguration.getEdrxCycle();
     }
 
     public void onDeviceProfileUpdate(DeviceProfile deviceProfile) {
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
index ebf673be84..5b92323634 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
@@ -349,11 +349,15 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
 
     @Override
     public Long getRequestTimeout(LwM2mClient client) {
-        var clientProfile = getProfile(client.getProfileId());
-        OtherConfiguration clientLwM2mSettings = clientProfile.getClientLwM2mSettings();
         Long timeout = null;
-        if (PowerMode.E_DRX.equals(clientLwM2mSettings.getPowerMode())) {
-            timeout = clientLwM2mSettings.getEdrxCycle();
+        if (PowerMode.E_DRX.equals(client.getPowerMode()) && client.getEdrxCycle() != null) {
+            timeout = client.getEdrxCycle();
+        } else {
+            var clientProfile = getProfile(client.getProfileId());
+            OtherConfiguration clientLwM2mSettings = clientProfile.getClientLwM2mSettings();
+            if (PowerMode.E_DRX.equals(clientLwM2mSettings.getPowerMode())) {
+                timeout = clientLwM2mSettings.getEdrxCycle();
+            }
         }
         if (timeout == null || timeout == 0L) {
             timeout = this.config.getTimeout();
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index e2d4fb719e..5cd4a38065 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1222,7 +1222,7 @@
             "drx": "Discontinuous Reception (DRX)",
             "edrx": "Extended Discontinuous Reception (eDRX)"
         },
-        "edrx-cycle": "eDRX cycle",
+        "edrx-cycle": "eDRX cycle in milliseconds",
         "edrx-cycle-required": "eDRX cycle is required.",
         "edrx-cycle-pattern": "eDRX cycle must be a positive integer.",
         "lwm2m": {