Android Sense device view changes and agent download

components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java

@@ -29,16 +29,27 @@ import org.wso2.carbon.device.mgt.iot.DeviceManagement;
 import org.wso2.carbon.device.mgt.iot.androidsense.plugin.constants.AndroidSenseConstants;
 import org.wso2.carbon.device.mgt.iot.androidsense.service.impl.util.DeviceJSON;
 import org.wso2.carbon.device.mgt.iot.androidsense.service.impl.util.SensorJSON;
+import org.wso2.carbon.device.mgt.iot.apimgt.AccessTokenInfo;
+import org.wso2.carbon.device.mgt.iot.apimgt.TokenClient;
+import org.wso2.carbon.device.mgt.iot.controlqueue.xmpp.XmppAccount;
+import org.wso2.carbon.device.mgt.iot.controlqueue.xmpp.XmppConfig;
+import org.wso2.carbon.device.mgt.iot.controlqueue.xmpp.XmppServerClient;
+import org.wso2.carbon.device.mgt.iot.exception.AccessTokenException;
 import org.wso2.carbon.device.mgt.iot.exception.DeviceControllerException;
 import org.wso2.carbon.device.mgt.iot.sensormgt.SensorDataManager;
 import org.wso2.carbon.device.mgt.iot.sensormgt.SensorRecord;
+import org.wso2.carbon.device.mgt.iot.util.ZipArchive;
+import org.wso2.carbon.device.mgt.iot.util.ZipUtil;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.UUID;
 
 public class AndroidSenseService {
 
@@ -206,6 +217,96 @@ public class AndroidSenseService {
 
     }
 
+    @Path("manager/device/{sketch_type}/download")
+    @GET
+    @Produces("application/octet-stream")
+    public Response downloadSketch(@QueryParam("owner") String owner,
+                                   @QueryParam("deviceName") String customDeviceName,
+                                   @PathParam("sketch_type") String sketchType) {
+        //TODO:: null check customDeviceName at UI level
+        try {
+            ZipArchive zipFile = createDownloadFile(owner, customDeviceName, sketchType);
+            Response.ResponseBuilder rb = Response.ok(zipFile.getZipFile());
+            rb.header("Content-Disposition",
+                      "attachment; filename=\"" + zipFile.getFileName() + "\"");
+            return rb.build();
+        } catch (IllegalArgumentException ex) {
+            return Response.status(400).entity(ex.getMessage()).build();//bad request
+        } catch (DeviceManagementException ex) {
+            return Response.status(500).entity(ex.getMessage()).build();
+        } catch (AccessTokenException ex) {
+            return Response.status(500).entity(ex.getMessage()).build();
+        } catch (DeviceControllerException ex) {
+            return Response.status(500).entity(ex.getMessage()).build();
+        }
+
+    }
+
+    private ZipArchive createDownloadFile(String owner, String customDeviceName, String sketchType)
+            throws DeviceManagementException, AccessTokenException, DeviceControllerException {
+        if (owner == null) {
+            throw new IllegalArgumentException("Error on createDownloadFile() Owner is null!");
+        }
+
+        //create new device id
+        String deviceId = shortUUID();
+
+        TokenClient accessTokenClient = new TokenClient(AndroidSenseConstants.DEVICE_TYPE);
+        AccessTokenInfo accessTokenInfo = accessTokenClient.getAccessToken(owner, deviceId);
+
+        //create token
+        String accessToken = accessTokenInfo.getAccess_token();
+        String refreshToken = accessTokenInfo.getRefresh_token();
+        //adding registering data
+
+        XmppAccount newXmppAccount = new XmppAccount();
+        newXmppAccount.setAccountName(owner + "_" + deviceId);
+        newXmppAccount.setUsername(deviceId);
+        newXmppAccount.setPassword(accessToken);
+        newXmppAccount.setEmail(deviceId + "@wso2.com");
+
+        XmppServerClient xmppServerClient = new XmppServerClient();
+        xmppServerClient.initControlQueue();
+        boolean status;
+
+        if (XmppConfig.getInstance().isEnabled()) {
+            status = xmppServerClient.createXMPPAccount(newXmppAccount);
+            if (!status) {
+                String msg =
+                        "XMPP Account was not created for device - " + deviceId + " of owner - " +
+                        owner +
+                        ".XMPP might have been disabled in org.wso2.carbon.device.mgt.iot" +
+                        ".common.config.server.configs";
+                log.warn(msg);
+                throw new DeviceManagementException(msg);
+            }
+        }
+
+        //Register the device with CDMF
+        String deviceName = customDeviceName + "_" + deviceId;
+        status = register(deviceId, owner);
+
+        if (!status) {
+            String msg = "Error occurred while registering the device with " + "id: " + deviceId
+                         + " owner:" + owner;
+            throw new DeviceManagementException(msg);
+        }
+
+
+        ZipUtil ziputil = new ZipUtil();
+        ZipArchive zipFile = ziputil.downloadSketch(owner, SUPER_TENANT, sketchType, deviceId, deviceName,
+                                                    accessToken, refreshToken);
+        zipFile.setDeviceId(deviceId);
+        return zipFile;
+    }
+
+    private static String shortUUID() {
+        UUID uuid = UUID.randomUUID();
+        long l = ByteBuffer.wrap(uuid.toString().getBytes(StandardCharsets.UTF_8)).getLong();
+        return Long.toString(l, Character.MAX_RADIX);
+    }
+
+
     /*    Service to push all the sensor data collected by the Android
            Called by the Android device  */
     @Path("controller/sensordata")

components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -18,14 +18,16 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core"
-       xsi:schemaLocation="
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
-         http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
 
 
 
     <jaxrs:server id="AndroidSense" address="/">
+        <jaxrs:features>
+            <cxf:logging/>
+        </jaxrs:features>
         <jaxrs:serviceBeans>
             <bean id="AndroidSenseService"
                   class="org.wso2.carbon.device.mgt.iot.androidsense.service.impl.AndroidSenseService"/>

features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics/Light/Eventstream_light_1.0.0/org.wso2.iot.devices.light_1.0.0.json

@@ -1,8 +1,8 @@
 {
   "name": "org.wso2.iot.devices.light",
   "version": "1.0.0",
-  "nickName": "light Data",
+  "nickName": "Light Data",
-  "description": "light data received from the Device",
+  "description": "Light data received from the Device",
   "metaData": [
     {"name":"owner","type":"STRING"},     
     {"name":"deviceType","type":"STRING"},

features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs

@@ -14,13 +14,8 @@
     <br>
     <ul class="list-unstyled">
         <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> Raspberry Pi (Internet Enabled)</li>
+                <i class="fw fw-right-arrow fw-stack-1x"></i></span> Android device</li>
-        <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
+
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> DHT11 Temperature Sensor</li>
-        <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> LED</li>
-        <li><span class="fw-stack fw-lg margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> Buzzer(3v)</li>
     </ul>
     <br>
 
@@ -168,14 +163,11 @@
     <p class="grey margin-top">Get your device ready</p>
     <br/>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device
+        <li class="padding-top-double"><span class="circle">01</span> Download the agent apk</li>
-            as shown in the schematic below and get the FireAlarm setup.</li>
+
+        <li class="padding-top-double"><span class="circle">02</span> Install the app in your Android device.</li>
 
-        <li class="padding-top-double"><span class="circle">02</span> Connect a monitor to your
-            RaspberryPi via the HDMI cable to get a UI view of the device.</li>
 
-        <li class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect
-            to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</li>
     </ul>
     <br>
 </div>
@@ -186,16 +178,17 @@
     <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
     <br/>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create
+        <li class="padding-top-double"><span class="circle">01</span> Start the IOT server</li>
-            DEB'</i> button above to get the download link for the FireAlarm setup files</b></li>
+
+        <li class="padding-top-double"><span class="circle">02</span> Connect the device to the network</li>
+
+        <li class="padding-top-double"><span class="circle">03</span> Start the Android Sense app in your device.</li>
+
+        <li class="padding-top-double"><span class="circle">04</span> Fill the login form with the credentials (Use server URL as <i>https://'<'YOUR_HOST'>':9443</i> and click on <strong>Enroll Device</strong> button.</li>
 
-        <li class="padding-top-double"><span class="circle">02</span> <i>(The following commands can
+        <li class="padding-top-double"><span class="circle">05</span> Once the device is enrolled, click on the <strong>+</strong> button to select the sensors.</li>
-            be issued by directly typing into the terminal of the device or by an <b>'ssh'</b> login
-            from a remote PC)</i></li>
 
-        <li class="padding-top-double"><span class="circle">03</span> <b>Download the FireAlarm setup
+        <li class="padding-top-double"><span class="circle">06</span> Click on the <i>Publish data</i> button to publish the sensor readings to the IOT server.</li>
-            files using the following command: 'curl -k < url_link_received_from_the_above_step >>
-            Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></li>
     </ul>
     <br>
 </div>

features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf

@@ -8,3 +8,7 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/devicemgt,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/android_sense/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/agent/,target:${installFolder}/../../resources/sketches/android_sense/,overwrite:true);\
+