Merge tag 'v6.2'

2 files changed, 14 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/database/NotificationManager.java b/src/main/java/org/traccar/database/NotificationManager.java
index 65437f0a1..60b4f246b 100644
--- a/src/main/java/org/traccar/database/NotificationManager.java
+++ b/src/main/java/org/traccar/database/NotificationManager.java
@@ -42,8 +42,10 @@ import jakarta.annotation.Nullable;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Singleton
@@ -59,6 +61,7 @@ public class NotificationManager {
 
     private final boolean geocodeOnRequest;
     private final long timeThreshold;
+    private final Set<Long> blockedUsers = new HashSet<>();
 
     @Inject
     public NotificationManager(
@@ -71,6 +74,12 @@ public class NotificationManager {
         this.geocoder = geocoder;
         geocodeOnRequest = config.getBoolean(Keys.GEOCODER_ON_REQUEST);
         timeThreshold = config.getLong(Keys.NOTIFICATOR_TIME_THRESHOLD);
+        String blockedUsersString = config.getString(Keys.NOTIFICATION_BLOCK_USERS);
+        if (blockedUsersString != null) {
+            for (String userIdString : blockedUsersString.split(",")) {
+                blockedUsers.add(Long.parseLong(userIdString));
+            }
+        }
     }
 
     private void updateEvent(Event event, Position position) {
@@ -122,6 +131,10 @@ public class NotificationManager {
 
             notifications.forEach(notification -> {
                 cacheManager.getNotificationUsers(notification.getId(), event.getDeviceId()).forEach(user -> {
+                    if (blockedUsers.contains(user.getId())) {
+                        LOGGER.info("User {} notification blocked", user.getId());
+                        return;
+                    }
                     for (String notificator : notification.getNotificatorsTypes()) {
                         try {
                             notificatorManager.getNotificator(notificator).send(notification, user, event, position);
diff --git a/src/main/java/org/traccar/database/StatisticsManager.java b/src/main/java/org/traccar/database/StatisticsManager.java
index 445e53e7c..8711289a0 100644
--- a/src/main/java/org/traccar/database/StatisticsManager.java
+++ b/src/main/java/org/traccar/database/StatisticsManager.java
@@ -121,7 +121,7 @@ public class StatisticsManager {
             }
 
             String url = config.getString(Keys.SERVER_STATISTICS);
-            if (url != null) {
+            if (url != null && !url.isEmpty()) {
                 String time = DateUtil.formatDate(statistics.getCaptureTime());
 
                 Form form = new Form();