From 8fd032c33619be2ec860261676b636ab743a6501 Mon Sep 17 00:00:00 2001 From: Pahansith Date: Wed, 8 May 2024 17:22:10 +0530 Subject: [PATCH 1/4] Fix issue in operation log not loading --- .../core/device/mgt/core/dto/operation/mgt/ConfigOperation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java index e6681e0e007..a556c216e7d 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java @@ -22,7 +22,7 @@ import java.util.List; public class ConfigOperation extends Operation { - private final List properties; + private final transient List properties; public ConfigOperation() { properties = new ArrayList<>(); From 1171086eb77ea4c28a19b28519494a358d503570 Mon Sep 17 00:00:00 2001 From: Pahansith Date: Wed, 8 May 2024 18:08:41 +0530 Subject: [PATCH 2/4] Remove duplicate properties field --- .../mgt/core/dto/operation/mgt/ConfigOperation.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java index a556c216e7d..4bc28b19fa0 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java @@ -22,21 +22,10 @@ import java.util.List; public class ConfigOperation extends Operation { - private final transient List properties; - public ConfigOperation() { - properties = new ArrayList<>(); setControl(Control.REPEAT); } - public List getConfigProperties() { - return properties; - } - - public void addConfigProperty(String name, Object value, Class type) { - properties.add(new Property(name, value, type)); - } - public Type getType() { return Type.CONFIG; } From 2169c6937a672af88cd0104bc3ab3758f1423a11 Mon Sep 17 00:00:00 2001 From: ashvini Date: Thu, 9 May 2024 07:43:39 +0530 Subject: [PATCH 3/4] Fix unknown application type error when installing web apps --- .../mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java index 61c34fcd4d4..42889367b4c 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java @@ -70,7 +70,7 @@ public class MDMAndroidOperationUtil { webApplication.setName(application.getName()); // webApplication.setType(application.getType().toString()); // Hard-corded "type" to "webapp". Some agent versions accept only "webapp" as the type. - webApplication.setType("webapp"); +// webApplication.setType("webapp"); webApplication.setProperties(application.getProperties()); operation.setPayLoad(webApplication.toJSON()); break; From 3fd61636030b0c37f05c6113ff8d829917607c27 Mon Sep 17 00:00:00 2001 From: ashvini Date: Mon, 13 May 2024 07:18:18 +0530 Subject: [PATCH 4/4] Remove comments --- .../core/device/mgt/core/util/MDMAndroidOperationUtil.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java index 42889367b4c..4485df61a1e 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java @@ -68,9 +68,7 @@ public class MDMAndroidOperationUtil { WebApplication webApplication = new WebApplication(); webApplication.setUrl(application.getLocation()); webApplication.setName(application.getName()); -// webApplication.setType(application.getType().toString()); -// Hard-corded "type" to "webapp". Some agent versions accept only "webapp" as the type. -// webApplication.setType("webapp"); + webApplication.setType(application.getType().toString()); webApplication.setProperties(application.getProperties()); operation.setPayLoad(webApplication.toJSON()); break;