|
|
@ -77,7 +77,6 @@ public class MonitoringTask implements Task {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DeviceManagementProviderService deviceManagementProviderService =
|
|
|
|
DeviceManagementProviderService deviceManagementProviderService =
|
|
|
|
PolicyManagementDataHolder.getInstance().getDeviceManagementService();
|
|
|
|
PolicyManagementDataHolder.getInstance().getDeviceManagementService();
|
|
|
|
|
|
|
|
|
|
|
@ -100,15 +99,21 @@ public class MonitoringTask implements Task {
|
|
|
|
deviceType.getName());
|
|
|
|
deviceType.getName());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (Device device : devices) {
|
|
|
|
for (Device device : devices) {
|
|
|
|
if (device.getEnrolmentInfo().getStatus().equals(EnrolmentInfo.Status.INACTIVE) ||
|
|
|
|
EnrolmentInfo.Status status = device.getEnrolmentInfo().getStatus();
|
|
|
|
device.getEnrolmentInfo().getStatus().equals(EnrolmentInfo.Status.BLOCKED)) {
|
|
|
|
if (status.equals(EnrolmentInfo.Status.INACTIVE) ||
|
|
|
|
|
|
|
|
status.equals(EnrolmentInfo.Status.BLOCKED) ||
|
|
|
|
|
|
|
|
status.equals(EnrolmentInfo.Status.REMOVED) ||
|
|
|
|
|
|
|
|
status.equals(EnrolmentInfo.Status.UNCLAIMED) ||
|
|
|
|
|
|
|
|
status.equals(EnrolmentInfo.Status.DISENROLLMENT_REQUESTED) ||
|
|
|
|
|
|
|
|
status.equals(EnrolmentInfo.Status.SUSPENDED)) {
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
notifiableDevices.add(device);
|
|
|
|
notifiableDevices.add(device);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
log.debug("Following devices selected to send the notification for " + deviceType.getName());
|
|
|
|
log.debug("Following devices selected to send the notification for " +
|
|
|
|
|
|
|
|
deviceType.getName());
|
|
|
|
for (Device device : notifiableDevices) {
|
|
|
|
for (Device device : notifiableDevices) {
|
|
|
|
log.debug(device.getDeviceIdentifier());
|
|
|
|
log.debug(device.getDeviceIdentifier());
|
|
|
|
}
|
|
|
|
}
|
|
|
|