mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge with master branch
This commit is contained in:
lasanthaDLPDS
commit
02d4d5d7ac
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>iot-analytics</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>androidsense-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>arduino-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>raspberrypi-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>virtual-fire-alarm-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mb-extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mb-extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>pull-notification-listeners</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>remote-session-extension</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>remote-session-extension</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>siddhi-extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -63,6 +63,11 @@ public class TestDeviceManager implements DeviceManager {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
|
||||
return true;
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>siddhi-extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>siddhi-extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>extensions</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -15,6 +15,22 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
*
|
||||
* Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.wso2.carbon.mdm.services.android.services;
|
||||
|
||||
@ -40,6 +56,7 @@ import javax.ws.rs.PUT;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.PathParam;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.QueryParam;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.util.List;
|
||||
@ -406,6 +423,10 @@ public interface DeviceManagementService {
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
value = "The unique device identifier.")
|
||||
@PathParam("id") String id);
|
||||
@PathParam("id") String id,
|
||||
@ApiParam(
|
||||
name = "permanentDelete",
|
||||
value = "Boolean flag indicating whether to permanently delete the device.")
|
||||
@QueryParam("permanentDelete") boolean permanentDelete);
|
||||
|
||||
}
|
||||
|
||||
@ -78,6 +78,7 @@ import javax.ws.rs.PUT;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.PathParam;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.QueryParam;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.util.ArrayList;
|
||||
@ -446,26 +447,40 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
||||
@DELETE
|
||||
@Path("/{id}")
|
||||
@Override
|
||||
public Response disEnrollDevice(@PathParam("id") String id) {
|
||||
public Response disEnrollDevice(@PathParam("id") String id,
|
||||
@QueryParam("permanentDelete") boolean permanentDelete) {
|
||||
boolean result;
|
||||
DeviceIdentifier deviceIdentifier = AndroidDeviceUtils.convertToDeviceIdentifierObject(id);
|
||||
try {
|
||||
result = AndroidAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
|
||||
if (permanentDelete) {
|
||||
result = AndroidAPIUtils.getDeviceManagementService().deleteDevice(deviceIdentifier);
|
||||
} else {
|
||||
AndroidDeviceUtils.updateDisEnrollOperationStatus(deviceIdentifier);
|
||||
result = AndroidAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier);
|
||||
}
|
||||
if (result) {
|
||||
String msg = "Android device that carries id '" + id + "' is successfully ";
|
||||
Message responseMessage = new Message();
|
||||
responseMessage.setResponseCode(Response.Status.OK.toString());
|
||||
responseMessage.setResponseMessage("Android device that carries id '" + id +
|
||||
"' has successfully dis-enrolled");
|
||||
if (permanentDelete) {
|
||||
responseMessage.setResponseMessage(msg + "deleted");
|
||||
} else {
|
||||
responseMessage.setResponseMessage(msg + "dis-enrolled");
|
||||
}
|
||||
return Response.status(Response.Status.OK).entity(responseMessage).build();
|
||||
} else {
|
||||
Message responseMessage = new Message();
|
||||
responseMessage.setResponseCode(Response.Status.NOT_FOUND.toString());
|
||||
responseMessage.setResponseMessage("Android device that carries id '" + id +
|
||||
"' has not been dis-enrolled");
|
||||
responseMessage.setResponseMessage("Android device that carries id '" + id + "' is not available");
|
||||
return Response.status(Response.Status.NOT_FOUND).entity(responseMessage).build();
|
||||
}
|
||||
} catch (DeviceManagementException e) {
|
||||
String msg = "Error occurred while dis-enrolling the Android device that carries the id '" + id + "'";
|
||||
String msg = "Error occurred while %s the Android device that carries the id '" + id + "'";
|
||||
if (permanentDelete) {
|
||||
msg = String.format(msg, "deleting");
|
||||
} else {
|
||||
msg = String.format(msg, "dis-enrolling");
|
||||
}
|
||||
log.error(msg, e);
|
||||
throw new UnexpectedServerErrorException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
|
||||
|
||||
@ -595,4 +595,27 @@ public class AndroidDeviceUtils {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update status of pending operations to error when a dis-enroll operation is triggered.
|
||||
*
|
||||
* @param deviceIdentifier Identifier of the device
|
||||
* @throws DeviceManagementException
|
||||
*/
|
||||
public static void updateDisEnrollOperationStatus(DeviceIdentifier deviceIdentifier)
|
||||
throws DeviceManagementException {
|
||||
try {
|
||||
List<? extends Operation> pendingOperations = getPendingOperations(deviceIdentifier);
|
||||
if (pendingOperations != null && !pendingOperations.isEmpty()) {
|
||||
for (Operation operation : pendingOperations) {
|
||||
operation.setStatus(Operation.Status.ERROR);
|
||||
AndroidAPIUtils.getDeviceManagementService().updateOperation(deviceIdentifier, operation);
|
||||
}
|
||||
}
|
||||
} catch (OperationManagementException e) {
|
||||
String msg = "Error occurred while retrieving pending operations to update operation statuses of " +
|
||||
"device to be dis-enrolled";
|
||||
log.error(msg);
|
||||
throw new DeviceManagementException(msg, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -300,7 +300,7 @@ public class DeviceManagementServiceTests {
|
||||
public void testDisEnrollDeviceSuccess()
|
||||
throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
|
||||
mockDeviceManagementService();
|
||||
Response response = deviceManagementService.disEnrollDevice(TestUtils.getDeviceId());
|
||||
Response response = deviceManagementService.disEnrollDevice(TestUtils.getDeviceId(), false);
|
||||
Assert.assertNotNull(response);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
|
||||
}
|
||||
@ -309,7 +309,7 @@ public class DeviceManagementServiceTests {
|
||||
public void testDisenrollUnSuccess()
|
||||
throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
|
||||
mockDeviceManagementService();
|
||||
Response response = deviceManagementService.disEnrollDevice("1234");
|
||||
Response response = deviceManagementService.disEnrollDevice("1234", false);
|
||||
Assert.assertNotNull(response);
|
||||
Assert.assertEquals(response.getStatus(), Response.Status.NOT_FOUND.getStatusCode());
|
||||
}
|
||||
|
||||
@ -51,6 +51,7 @@ import org.wso2.carbon.mdm.services.android.utils.TestUtils;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class DeviceManagementProviderServiceMock implements DeviceManagementProviderService {
|
||||
@Override
|
||||
@ -152,6 +153,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Device> getDevicesBasedOnProperties(Map map) throws DeviceManagementException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Device getDevice(String s, Date date, boolean b) throws DeviceManagementException {
|
||||
if (TestUtils.getDeviceId().equals(s)) {
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Android UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
data-type="{{device.type}}"
|
||||
data-ownership="{{device.ownership}}"
|
||||
data-owner="{{device.owner}}"
|
||||
data-status="{{devicamera-enabledce.status}}"
|
||||
data-status="{{device.status}}"
|
||||
data-deviceinfoservice="{{device.deviceInfoServiceAPI}}"
|
||||
data-devicelocationservice="{{device.deviceLocationServiceAPI}}">
|
||||
{{device.owner}}'s {{device.name}}
|
||||
|
||||
@ -120,7 +120,9 @@
|
||||
<input type="{{this.type}}" id="{{this.id}}"
|
||||
class="checkbox"
|
||||
placeholder="{{this.label}}"
|
||||
data-param-type="form"/>
|
||||
data-param-type="form"
|
||||
data-toggle="tooltip"
|
||||
title="{{this.helper}}"/>
|
||||
{{this.label}}
|
||||
<br/>
|
||||
{{/equal}}
|
||||
|
||||
@ -323,6 +323,7 @@ var generatePayload = function (operationCode, operationData, deviceList) {
|
||||
payload = {
|
||||
"operation": {
|
||||
"CAMERA": operationData["cameraEnabled"],
|
||||
"BACKUP_SERVICE": operationData["enableBackupService"],
|
||||
"DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"],
|
||||
"DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"],
|
||||
"DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"],
|
||||
@ -546,6 +547,7 @@ var androidOperationConstants = {
|
||||
"PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY",
|
||||
"VPN_OPERATION_CODE": "VPN",
|
||||
"CAMERA_OPERATION_CODE": "CAMERA",
|
||||
"BACKUP_SERVICE_CODE": "BACKUP_SERVICE",
|
||||
"ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE",
|
||||
"WIFI_OPERATION_CODE": "WIFI",
|
||||
"WIPE_OPERATION_CODE": "WIPE_DATA",
|
||||
|
||||
@ -120,7 +120,9 @@
|
||||
<input type="{{this.type}}" id="{{this.id}}"
|
||||
class="checkbox"
|
||||
placeholder="{{this.label}}"
|
||||
data-param-type="form"/>
|
||||
data-param-type="form"
|
||||
data-toggle="tooltip"
|
||||
title="{{this.helper}}"/>
|
||||
{{this.label}}
|
||||
<br/>
|
||||
{{/equal}}
|
||||
|
||||
@ -50,6 +50,7 @@ var androidOperationModule = function () {
|
||||
"PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY",
|
||||
"VPN_OPERATION_CODE": "VPN",
|
||||
"CAMERA_OPERATION_CODE": "CAMERA",
|
||||
"BACKUP_SERVICE_CODE": "BACKUP_SERVICE",
|
||||
"ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE",
|
||||
"WIFI_OPERATION_CODE": "WIFI",
|
||||
"GLOBAL_PROXY_OPERATION_CODE": "GLOBAL_PROXY",
|
||||
@ -333,6 +334,7 @@ var androidOperationModule = function () {
|
||||
payload = {
|
||||
"operation": {
|
||||
"CAMERA": operationData["cameraEnabled"],
|
||||
"BACKUP_SERVICE": operationData["enableBackupService"],
|
||||
"DISALLOW_ADJUST_VOLUME": operationData["disallowAdjustVolumeEnabled"],
|
||||
"DISALLOW_CONFIG_BLUETOOTH": operationData["disallowConfigBluetooth"],
|
||||
"DISALLOW_CONFIG_CELL_BROADCASTS": operationData["disallowConfigCellBroadcasts"],
|
||||
@ -707,6 +709,7 @@ var androidOperationModule = function () {
|
||||
"WIFI": "configure-wifi",
|
||||
"GLOBAL_PROXY": "configure-global-proxy",
|
||||
"CAMERA": "control-camera",
|
||||
"BACKUP_SERVICE": "enable-backup",
|
||||
"VPN": "configure-vpn",
|
||||
"DEVICE_LOCK": "lock-devices",
|
||||
"DEVICE_UNLOCK": "unlock-devices",
|
||||
@ -1141,6 +1144,9 @@ var androidOperationModule = function () {
|
||||
} else if (featureCode == androidOperationConstants["DISALLOW_ADJUST_VOLUME"]) {
|
||||
restrictions["disallowAdjustVolumeEnabled"] = restriction["enabled"];
|
||||
continue;
|
||||
} else if (featureCode == androidOperationConstants["BACKUP_SERVICE_CODE"]) {
|
||||
restrictions["enableBackupService"] = restriction["enabled"];
|
||||
continue;
|
||||
} else if (featureCode == androidOperationConstants["DISALLOW_CONFIG_BLUETOOTH"]) {
|
||||
restrictions["disallowConfigBluetooth"] = restriction["enabled"];
|
||||
continue;
|
||||
|
||||
@ -174,14 +174,14 @@ var ovpnConfigUploaded = function () {
|
||||
};
|
||||
|
||||
var certConfigUploaded = function (val) {
|
||||
var certFileInput = document.getElementById("cert-file-field");
|
||||
if ('files' in certFileInput) {
|
||||
if (certFileInput.files.length === 1) {
|
||||
var certFileInput = $(val);
|
||||
if (certFileInput[0].files) {
|
||||
if (certFileInput[0].files.length === 1) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function (progressEvent) {
|
||||
reader.onload = function(progressEvent){
|
||||
var txt = "";
|
||||
var lines = this.result.split('\n');
|
||||
for (var line = 0; line < lines.length; line++) {
|
||||
for(var line = 0; line < lines.length; line++){
|
||||
console.log(lines[line]);
|
||||
if (lines[line].charAt(0) !== '#') {
|
||||
txt += lines[line] + '\n';
|
||||
@ -191,7 +191,7 @@ var certConfigUploaded = function (val) {
|
||||
//console.log(document.getElementById ("cert-config").value);
|
||||
$(val).next().val(txt);
|
||||
};
|
||||
reader.readAsText(certFileInput.files[0]);
|
||||
reader.readAsText(certFileInput[0].files[0]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -78,9 +78,9 @@
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cert', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-security-policy fw-stack-2x"></i>
|
||||
<i class="fw fw-pages fw-stack-2x"></i>
|
||||
</span>
|
||||
Secure Certificates
|
||||
Certificates Install
|
||||
<span id="cert-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
|
||||
<span id="cert-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
|
||||
<span id="cert-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
@ -508,9 +508,8 @@
|
||||
<div>
|
||||
<ul class="message message-info">
|
||||
<i class="icon fw fw-info"></i>
|
||||
<a id="policy-listing-status-msg">Below restrictions will be applied on devices with
|
||||
Android
|
||||
version 6.0 Marshmallow onwards only.</a>
|
||||
<a id="policy-listing-status-msg">Below restrictions will be applicable when the agent is the
|
||||
<b>device owner</b> and Android version 6.0 (Marshmallow) or higher.</a>
|
||||
</ul>
|
||||
</div>
|
||||
<br>
|
||||
@ -863,6 +862,17 @@
|
||||
</label>
|
||||
</div>
|
||||
<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}}
|
||||
</div>
|
||||
</div>
|
||||
@ -1432,7 +1442,7 @@
|
||||
data-operation-code="INSTALL_CERT">
|
||||
<div id="cert-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Secure Certificate Settings
|
||||
Certificate Install Settings
|
||||
<label class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cert-body">
|
||||
<input type="checkbox"/>
|
||||
@ -1441,7 +1451,7 @@
|
||||
</label>
|
||||
</h2>
|
||||
<div class="panel-title-description">
|
||||
Configure the Secure Certificate settings on Android devices.
|
||||
Configure the certificate install settings on Android devices.
|
||||
</div>
|
||||
</div>
|
||||
<div id="cert-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
|
||||
@ -61,9 +61,9 @@
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cert', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-security-policy fw-stack-2x"></i>
|
||||
<i class="fw fw-pages fw-stack-2x"></i>
|
||||
</span>
|
||||
Secure Certificate
|
||||
Certificate Install
|
||||
<span id="cert-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
|
||||
<span id="cert-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
|
||||
<span id="cert-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
@ -756,8 +756,14 @@
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="">
|
||||
<ul class="message message-info">
|
||||
<i class="icon fw fw-info"></i>
|
||||
<a id="policy-listing-status-msg">Below restrictions will be applicable when the agent is the
|
||||
<b>device owner</b> and Android version 6.0 (Marshmallow) or higher.</a>
|
||||
</ul>
|
||||
</div>
|
||||
<br>
|
||||
<div class="wr-input-control">
|
||||
<label class="wr-input-control checkbox">
|
||||
<input id="disallow-set-wallpeper" type="checkbox"
|
||||
@ -860,6 +866,18 @@
|
||||
</span>
|
||||
</label>
|
||||
</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}}
|
||||
</div>
|
||||
</div>
|
||||
@ -2321,7 +2339,7 @@
|
||||
data-operation-code="INSTALL_CERT">
|
||||
<div id="cert-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Secure Certificate Settings
|
||||
Certificate Install Settings
|
||||
<label class="wr-input-control switch hidden" data-toggle="collapse"
|
||||
data-target="#cert-body">
|
||||
<input type="checkbox"/>
|
||||
@ -2330,7 +2348,7 @@
|
||||
</label>
|
||||
</h2>
|
||||
<div class="panel-title-description">
|
||||
Configure the Secure Certificate settings on Android devices.
|
||||
Configure the certificate install settings on Android devices.
|
||||
</div>
|
||||
</div>
|
||||
<div id="cert-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
|
||||
@ -115,11 +115,10 @@ var ovpnConfigUploaded = function () {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
var certConfigUploaded = function (val) {
|
||||
var certFileInput = document.getElementById("cert-file-field");
|
||||
if ('files' in certFileInput) {
|
||||
if (certFileInput.files.length === 1) {
|
||||
var certFileInput = $(val);
|
||||
if (certFileInput[0].files) {
|
||||
if (certFileInput[0].files.length === 1) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function(progressEvent){
|
||||
var txt = "";
|
||||
@ -134,7 +133,7 @@ var certConfigUploaded = function (val) {
|
||||
//console.log(document.getElementById ("cert-config").value);
|
||||
$(val).next().val(txt);
|
||||
};
|
||||
reader.readAsText(certFileInput.files[0]);
|
||||
reader.readAsText(certFileInput[0].files[0]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -78,9 +78,9 @@
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cert', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-security-policy fw-stack-2x"></i>
|
||||
<i class="fw fw-pages fw-stack-2x"></i>
|
||||
</span>
|
||||
Secure Certificate
|
||||
Certificate Install
|
||||
<span id="cert-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
|
||||
<span id="cert-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
|
||||
<span id="cert-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
@ -518,8 +518,8 @@
|
||||
<div class="">
|
||||
<ul class="message message-info">
|
||||
<i class="icon fw fw-info"></i>
|
||||
<a id="policy-listing-status-msg">Below restrictions will be applied on devices with
|
||||
Android version 6.0 Marshmallow onwards only.</a>
|
||||
<a id="policy-listing-status-msg">Below restrictions will be applicable when the agent is the
|
||||
<b>device owner</b> and Android version 6.0 (Marshmallow) or higher.</a>
|
||||
</ul>
|
||||
</div>
|
||||
<br>
|
||||
@ -880,6 +880,17 @@
|
||||
</label>
|
||||
</div>
|
||||
<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}}
|
||||
</div>
|
||||
</div>
|
||||
@ -2346,7 +2357,7 @@
|
||||
data-operation-code="INSTALL_CERT">
|
||||
<div id="cert-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Secure Certificate Settings
|
||||
Certificate Install Settings
|
||||
<label class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cert-body">
|
||||
<input type="checkbox"/>
|
||||
@ -2355,7 +2366,7 @@
|
||||
</label>
|
||||
</h2>
|
||||
<div class="panel-title-description">
|
||||
Configure the Secure Certificate settings on Android devices.
|
||||
Configure the certificate install settings on Android devices.
|
||||
</div>
|
||||
</div>
|
||||
<div id="cert-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -220,6 +220,12 @@ public class AndroidDeviceManager implements DeviceManager {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
|
||||
//Returning false since AndroidDeviceManager is not used instead DeviceTypeManager is used.
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
|
||||
boolean isEnrolled = false;
|
||||
|
||||
@ -209,11 +209,19 @@ public class AndroidFeatureManager implements FeatureManager {
|
||||
feature.setName("wifi");
|
||||
feature.setDescription("Setting up wifi configuration");
|
||||
supportedFeatures.add(feature);
|
||||
|
||||
feature = new Feature();
|
||||
feature.setCode("CAMERA");
|
||||
feature.setName("camera");
|
||||
feature.setDescription("Enable or disable camera");
|
||||
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.setCode("EMAIL");
|
||||
feature.setName("Email");
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Mobile Windows UI</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>windows-plugin</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -169,6 +169,12 @@ public class WindowsDeviceManager implements DeviceManager {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
|
||||
//Returning false since WindowsDeviceManager is not used instead DeviceTypeManager is used.
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
|
||||
boolean isEnrolled = false;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.iot.device.statistics.dashboard.feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>analytics-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense Analytics Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense Backend Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>androidsense-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - IoT Server Android Sense UI Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>arduino-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>arduino-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>arduino-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>carbon-device-mgt-plugins-parent</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>raspberrypi-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
|
||||
<artifactId>device-types-feature</artifactId>
|
||||
<version>4.2.7-SNAPSHOT</version>
|
||||
<version>4.2.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user