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 'master' into 'master'

Browse Source 
Implement enable device backup service restriction in android plugins

See merge request entgra/carbon-device-mgt-plugins!57
This commit is contained in:
Charitha Goonetilleke 2019-07-05 08:53:49 +00:00
commit c46d5f431f
7 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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.operation-bar/public/js/operation-bar.js
View File

@ -323,6 +323,7 @@ var generatePayload = function (operationCode, operationData, deviceList) {
payload = { payload = {
"operation": { "operation": {
"CAMERA": operationData["cameraEnabled"], "CAMERA": operationData["cameraEnabled"],
"BACKUP_SERVICE": operationData["enableBackupService"],
"DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"], "DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"],
"DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"], "DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"],
"DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"], "DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"],
@ -546,6 +547,7 @@ var androidOperationConstants = {
"PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY", "PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY",
"VPN_OPERATION_CODE": "VPN", "VPN_OPERATION_CODE": "VPN",
"CAMERA_OPERATION_CODE": "CAMERA", "CAMERA_OPERATION_CODE": "CAMERA",
"BACKUP_SERVICE_CODE": "BACKUP_SERVICE",
"ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE", "ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE",
"WIFI_OPERATION_CODE": "WIFI", "WIFI_OPERATION_CODE": "WIFI",
"WIPE_OPERATION_CODE": "WIPE_DATA", "WIPE_OPERATION_CODE": "WIPE_DATA",

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.operation-mod/public/js/operation-mod.js
View File

@ -50,6 +50,7 @@ var androidOperationModule = function () {
"PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY", "PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY",
"VPN_OPERATION_CODE": "VPN", "VPN_OPERATION_CODE": "VPN",
"CAMERA_OPERATION_CODE": "CAMERA", "CAMERA_OPERATION_CODE": "CAMERA",
"BACKUP_SERVICE_CODE": "BACKUP_SERVICE",
"ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE", "ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE",
"WIFI_OPERATION_CODE": "WIFI", "WIFI_OPERATION_CODE": "WIFI",
"GLOBAL_PROXY_OPERATION_CODE": "GLOBAL_PROXY", "GLOBAL_PROXY_OPERATION_CODE": "GLOBAL_PROXY",
@ -333,6 +334,7 @@ var androidOperationModule = function () {
payload = { payload = {
"operation": { "operation": {
"CAMERA": operationData["cameraEnabled"], "CAMERA": operationData["cameraEnabled"],
"BACKUP_SERVICE": operationData["enableBackupService"],
"DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"], "DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"],
"DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"], "DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"],
"DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"], "DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"],
@ -707,6 +709,7 @@ var androidOperationModule = function () {
"WIFI": "configure-wifi", "WIFI": "configure-wifi",
"GLOBAL_PROXY": "configure-global-proxy", "GLOBAL_PROXY": "configure-global-proxy",
"CAMERA": "control-camera", "CAMERA": "control-camera",
"BACKUP_SERVICE": "enable-backup",
"VPN": "configure-vpn", "VPN": "configure-vpn",
"DEVICE_LOCK": "lock-devices", "DEVICE_LOCK": "lock-devices",
"DEVICE_UNLOCK": "unlock-devices", "DEVICE_UNLOCK": "unlock-devices",
@ -1141,6 +1144,9 @@ var androidOperationModule = function () {
} else if (featureCode == androidOperationConstants["DISALLOW_ADJUST_VOLUME"]) { } else if (featureCode == androidOperationConstants["DISALLOW_ADJUST_VOLUME"]) {
restrictions["disallowAdjustVolumeEnabled"] = restriction["enabled"]; restrictions["disallowAdjustVolumeEnabled"] = restriction["enabled"];
continue; continue;
} else if (featureCode == androidOperationConstants["BACKUP_SERVICE_CODE"]) {
restrictions["enableBackupService"] = restriction["enabled"];
continue;
} else if (featureCode == androidOperationConstants["DISALLOW_CONFIG_BLUETOOTH"]) { } else if (featureCode == androidOperationConstants["DISALLOW_CONFIG_BLUETOOTH"]) {
restrictions["disallowConfigBluetooth"] = restriction["enabled"]; restrictions["disallowConfigBluetooth"] = restriction["enabled"];
continue; continue;

11
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.policy-edit/public/templates/android-policy-edit.hbs
View File

@ -862,6 +862,17 @@
</label> </label>
</div> </div>
<br> <br>
<div class="wr-input-control">
<label class="wr-input-control checkbox">
<input id="backup-service-enabled" type="checkbox" class="operationDataKeys"
data-key="enableBackupService"/>
<span class="helper" title="Device backup service will be enabled.">
Enable device backup service
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br>
{{/unless}} {{/unless}}
</div> </div>
</div> </div>

12
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.policy-view/public/templates/android-policy-view.hbs
View File

@ -866,6 +866,18 @@
</span> </span>
</label> </label>
</div> </div>
<div class="wr-input-control">
<label class="wr-input-control checkbox">
<input id="backup-service-enabled" type="checkbox" class="operationDataKeys"
data-key="enableBackupService" disabled/>
<span class="helper" title="Having this checked would enable backup service.">
Enable device backup service
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br>
{{/unless}} {{/unless}}
</div> </div>
</div> </div>

11
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.policy-wizard/public/templates/android-policy-operations.hbs
View File

@ -880,6 +880,17 @@
</label> </label>
</div> </div>
<br> <br>
<div class="wr-input-control device-owner">
<label class="wr-input-control checkbox">
<input id="backup-service-enabled" type="checkbox" class="operationDataKeys"
data-key="enableBackupService"/>
<span class="helper" title="Device backup service will be enabled">
Enable device backup service
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br>
{{/unless}} {{/unless}}
</div> </div>
</div> </div>

8
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
View File

@ -209,11 +209,19 @@ public class AndroidFeatureManager implements FeatureManager {
feature.setName("wifi"); feature.setName("wifi");
feature.setDescription("Setting up wifi configuration"); feature.setDescription("Setting up wifi configuration");
supportedFeatures.add(feature); supportedFeatures.add(feature);
feature = new Feature(); feature = new Feature();
feature.setCode("CAMERA"); feature.setCode("CAMERA");
feature.setName("camera"); feature.setName("camera");
feature.setDescription("Enable or disable camera"); feature.setDescription("Enable or disable camera");
supportedFeatures.add(feature); supportedFeatures.add(feature);
feature = new Feature();
feature.setCode("BACKUP_SERVICE");
feature.setName("Set Backup Service");
feature.setDescription("set backup service");
supportedFeatures.add(feature);
feature = new Feature(); feature = new Feature();
feature.setCode("EMAIL"); feature.setCode("EMAIL");
feature.setName("Email"); feature.setName("Email");

4
features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
View File

@ -605,6 +605,10 @@
<Name>Fetch device logcat</Name> <Name>Fetch device logcat</Name>
<Description>Fetch device logcat</Description> <Description>Fetch device logcat</Description>
</Feature> </Feature>
<Feature type="policy" code="BACKUP_SERVICE">
<Name>Enable Backup Service</Name>
<Description>Enable or disable backup service</Description>
</Feature>
<Feature type="operation" hidden="false" code="DEVICE_UNLOCK"> <Feature type="operation" hidden="false" code="DEVICE_UNLOCK">
<Name>Unlock the device</Name> <Name>Unlock the device</Name>
<Description>Unlock the device</Description> <Description>Unlock the device</Description>