rajitha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing windows issues

Browse Source
revert-dabc3590
hasuniea 8 years ago
parent 7697c3ca39
commit ece43f53bd
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
Unescape View File

@ -1195,9 +1195,9 @@ var operationModule = function () {
var featureMap = { var featureMap = {
"DEVICE_LOCK": "lock-devices", "DEVICE_LOCK": "lock-devices",
"DISENROLL": "disenroll", "DISENROLL": "disenroll",
"DEVICE_RING": "ring-devices", "DEVICE_RING": "ring-device",
"LOCK_RESET": "lock-reset-devices", "LOCK_RESET": "lock-reset",
"WIPE_DATA": "wipe-devices" "WIPE_DATA": "wipe-data"
}; };
//return "/mdm-windows-agent/services/windows/operation/" + featureMap[operationCode]; //return "/mdm-windows-agent/services/windows/operation/" + featureMap[operationCode];
return "/api/device-mgt/windows/v1.0/services/windows/admin/devices/" + featureMap[operationCode]; return "/api/device-mgt/windows/v1.0/services/windows/admin/devices/" + featureMap[operationCode];

5
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
Unescape View File

@ -236,7 +236,6 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
@ -254,12 +253,10 @@
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!--CDM dependancies--> <!--CDM dependancies-->
@ -345,13 +342,11 @@
<groupId>org.codehaus.jettison.wso2</groupId> <groupId>org.codehaus.jettison.wso2</groupId>
<artifactId>jettison</artifactId> <artifactId>jettison</artifactId>
<version>1.1.wso2v1</version> <version>1.1.wso2v1</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json.wso2</groupId> <groupId>org.json.wso2</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>2.0.0.wso2v1</version> <version>2.0.0.wso2v1</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>

10
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationHandler.java
Unescape View File

@ -353,7 +353,7 @@ public class OperationHandler {
for (ItemTag item : results) { for (ItemTag item : results) {
for (OperationCode.Info info : OperationCode.Info.values()) { for (OperationCode.Info info : OperationCode.Info.values()) {
if (item.getSource().getLocURI().equals(info.getCode()) && if (item.getSource().getLocURI().equals(info.getCode()) &&
PluginConstants.OperationCodes.CAMERA_STATUS.equals(info.name())) { PluginConstants.OperationCodes.CAMERA_STATUS.equals(info.name())) {
Profile cameraProfile = new Profile(); Profile cameraProfile = new Profile();
cameraProfile.setFeatureCode(PluginConstants.OperationCodes.CAMERA); cameraProfile.setFeatureCode(PluginConstants.OperationCodes.CAMERA);
cameraProfile.setData(item.getData()); cameraProfile.setData(item.getData());
@ -365,7 +365,7 @@ public class OperationHandler {
profiles.add(cameraProfile); profiles.add(cameraProfile);
} }
if (item.getSource().getLocURI().equals(info.getCode()) && if (item.getSource().getLocURI().equals(info.getCode()) &&
PluginConstants.OperationCodes.ENCRYPT_STORAGE_STATUS.equals(info.name())) { PluginConstants.OperationCodes.ENCRYPT_STORAGE_STATUS.equals(info.name())) {
Profile encryptStorage = new Profile(); Profile encryptStorage = new Profile();
encryptStorage.setFeatureCode(PluginConstants.OperationCodes.ENCRYPT_STORAGE); encryptStorage.setFeatureCode(PluginConstants.OperationCodes.ENCRYPT_STORAGE);
encryptStorage.setData(item.getData()); encryptStorage.setData(item.getData());
@ -377,7 +377,7 @@ public class OperationHandler {
profiles.add(encryptStorage); profiles.add(encryptStorage);
} }
if (item.getSource().getLocURI().equals(info.getCode()) && if (item.getSource().getLocURI().equals(info.getCode()) &&
PluginConstants.OperationCodes.DEVICE_PASSWORD_STATUS.equals(info.name())) { PluginConstants.OperationCodes.DEVICE_PASSWORD_STATUS.equals(info.name())) {
Profile encryptStorage = new Profile(); Profile encryptStorage = new Profile();
encryptStorage.setFeatureCode(PluginConstants.OperationCodes.PASSCODE_POLICY); encryptStorage.setFeatureCode(PluginConstants.OperationCodes.PASSCODE_POLICY);
encryptStorage.setData(item.getData()); encryptStorage.setData(item.getData());
@ -394,7 +394,6 @@ public class OperationHandler {
Notification notification = new Notification(); Notification notification = new Notification();
notification.setDescription("Auto generated DevicePin : " + pinValue); notification.setDescription("Auto generated DevicePin : " + pinValue);
notification.setOperationId(result.getCommandReference()); notification.setOperationId(result.getCommandReference());
// notification.setDeviceIdentifier(deviceIdentifier);
notification.setStatus(String.valueOf(Notification.Status.NEW)); notification.setStatus(String.valueOf(Notification.Status.NEW));
try { try {
nmService.addNotification(deviceIdentifier, notification); nmService.addNotification(deviceIdentifier, notification);
@ -476,7 +475,7 @@ public class OperationHandler {
} }
} }
WindowsAPIUtils.getPolicyManagerService().checkPolicyCompliance(deviceIdentifier, WindowsAPIUtils.getPolicyManagerService().checkPolicyCompliance(deviceIdentifier,
complianceFeatures); complianceFeatures);
} }
} catch (JSONException e) { } catch (JSONException e) {
throw new WindowsOperationException("Error occurred while parsing json object.", e); throw new WindowsOperationException("Error occurred while parsing json object.", e);
@ -486,6 +485,5 @@ public class OperationHandler {
throw new WindowsOperationException("Error occurred while getting effective policy.", e); throw new WindowsOperationException("Error occurred while getting effective policy.", e);
} }
} }
} }
} }

Write Preview
Loading…
Cancel
Save