community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'application-mgt-new' into 'application-mgt-new'

Browse Source 
Sync with upstream master

See merge request entgra/carbon-device-mgt-plugins!67
This commit is contained in:
Dharmakeerthi Lasantha 2019-08-22 13:14:37 +00:00
commit b83c8806af
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidDeviceUtils.java
View File

@ -251,6 +251,20 @@ public class AndroidDeviceUtils {
} }
} }
AndroidAPIUtils.getDeviceManagementService().updateOperation(deviceIdentifier, operation); AndroidAPIUtils.getDeviceManagementService().updateOperation(deviceIdentifier, operation);
// This has to be bellow other if blocks, since updateOperation would fail if we execute against a disenrolled
// device.
if (!Operation.Status.ERROR.equals(operation.getStatus()) && AndroidConstants.
OperationCodes.WIPE_DATA.equals(operation.getCode())) {
if (log.isDebugEnabled()) {
log.debug("Received wipe data from device '" + deviceId + "'");
}
try {
AndroidAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
} catch (DeviceManagementException e) {
throw new OperationManagementException("Error occurred while unenrolling the device.", e);
}
}
} }
public static List<? extends Operation> getPendingOperations public static List<? extends Operation> getPendingOperations

6
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
View File

@ -20,12 +20,12 @@
data-deviceinfoservice="{{device.deviceInfoServiceAPI}}" data-deviceinfoservice="{{device.deviceInfoServiceAPI}}"
data-devicelocationservice="{{device.deviceLocationServiceAPI}}"> data-devicelocationservice="{{device.deviceLocationServiceAPI}}">
{{device.owner}}'s {{device.name}} {{device.owner}}'s {{device.name}}
<a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}} </h1>
<a id="device-info-tooltip" href="#" data-toggle="tooltip" title="Device Identifier: {{device.deviceIdentifier}}
Firmware Build Date: {{device.osBuildDate}} Firmware Build Date: {{device.osBuildDate}}
UDID: {{device.udid}}"> UDID: {{device.udid}}">
<i class="fw fw-info"></i> <i class="fw fw-info"></i>
</a> </a>
</h1>
{{#if device.model}} {{#if device.model}}
<h4>{{device.vendor}} {{device.model}}</h4> <h4>{{device.vendor}} {{device.model}}</h4>
{{/if}} {{/if}}