Merge pull request #733 from rasika/android-sense

Android sense re-enrollment fixed

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

@@ -123,7 +123,8 @@ public class AndroidSenseServiceImpl implements AndroidSenseService {
         deviceIdentifier.setId(deviceId);
         deviceIdentifier.setType(AndroidSenseConstants.DEVICE_TYPE);
         try {
-            if (APIUtil.getDeviceManagementService().isEnrolled(deviceIdentifier)) {
+            Device enrolledDevice = APIUtil.getDeviceManagementService().getDevice(deviceIdentifier);
+            if (enrolledDevice != null && !enrolledDevice.getEnrolmentInfo().getStatus().equals(EnrolmentInfo.Status.REMOVED)) {
                 AndroidConfiguration androidConfiguration = new AndroidConfiguration();
                 androidConfiguration.setTenantDomain(APIUtil.getAuthenticatedUserTenantDomain());
                 androidConfiguration.setMqttEndpoint(APIUtil.getMqttEndpoint());