updated android sense topic

components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherService.java

@@ -176,14 +176,8 @@ public class DataPublisherService extends Service {
                         if (!mqttTransportHandler.isConnected()) {
                             mqttTransportHandler.connect();
                         }
-
+                        String topic = LocalRegistry.getTenantDomain(context) + "/" + SenseConstants.DEVICE_TYPE + "/" + deviceId + "/data";
-
-                                String topic = "wso2/" + LocalRegistry.getTenantDomain(context) + "/" + SenseConstants
-                                        .DEVICE_TYPE + "/" + deviceId + "/data";
                         mqttTransportHandler.publishDeviceData(user, deviceId, jsonArray.toString(), topic);
-
-
-
                     }
                 } catch (JSONException e) {
                     Log.e(TAG, "Json Data Parsing Exception", e);

components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/mqtt/transport/MQTTTransportHandler.java

@@ -77,7 +77,7 @@ public abstract class MQTTTransportHandler implements MqttCallback, TransportHan
         String username = LocalRegistry.getUsername(context);
         String deviceId = LocalRegistry.getDeviceId(context);
         this.clientId = deviceId + ":" + SenseConstants.DEVICE_TYPE;
-        this.subscribeTopic = "wso2/" + LocalRegistry.getTenantDomain(context)+ "/" + SenseConstants.DEVICE_TYPE + "/" +
+        this.subscribeTopic = LocalRegistry.getTenantDomain(context)+ "/" + SenseConstants.DEVICE_TYPE + "/" +
                 deviceId + "/command/#";
         this.clientWillTopic = DISCONNECTION_WILL_TOPIC_PREFIX + SenseConstants.DEVICE_TYPE;
         this.mqttBrokerEndPoint = LocalRegistry.getMqttEndpoint(context);