Pass user to notificators

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/org/traccar/database/MailManager.java b/src/main/java/org/traccar/database/MailManager.java
index d94f55cda..21fee5ee7 100644
--- a/src/main/java/org/traccar/database/MailManager.java
+++ b/src/main/java/org/traccar/database/MailManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
  * Copyright 2017 - 2018 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,14 +92,12 @@ public final class MailManager {
     }
 
     public void sendMessage(
-            long userId, String subject, String body) throws MessagingException {
-        sendMessage(userId, subject, body, null);
+            User user, String subject, String body) throws MessagingException {
+        sendMessage(user, subject, body, null);
     }
 
     public void sendMessage(
-            long userId, String subject, String body, MimeBodyPart attachment) throws MessagingException {
-        User user = Context.getPermissionsManager().getUser(userId);
-
+            User user, String subject, String body, MimeBodyPart attachment) throws MessagingException {
         Properties properties = null;
         if (!Context.getConfig().getBoolean("mail.smtp.ignoreUserConfig")) {
             properties = getProperties(new PropertiesProvider(user));
diff --git a/src/main/java/org/traccar/database/NotificationManager.java b/src/main/java/org/traccar/database/NotificationManager.java
index 64f3b6775..f88b3b18c 100644
--- a/src/main/java/org/traccar/database/NotificationManager.java
+++ b/src/main/java/org/traccar/database/NotificationManager.java
@@ -35,6 +35,7 @@ import org.traccar.model.Event;
 import org.traccar.model.Notification;
 import org.traccar.model.Position;
 import org.traccar.model.Typed;
+import org.traccar.model.User;
 import org.traccar.storage.StorageException;
 
 public class NotificationManager extends ExtendedObjectManager<Notification> {
@@ -106,8 +107,9 @@ public class NotificationManager extends ExtendedObjectManager<Notification> {
                         .getAddress(position.getLatitude(), position.getLongitude(), null));
             }
 
+            User user = Context.getUsersManager().getById(userId);
             for (String notificator : notificators) {
-                Context.getNotificatorManager().getNotificator(notificator).sendAsync(userId, event, position);
+                Context.getNotificatorManager().getNotificator(notificator).sendAsync(user, event, position);
             }
         }
         if (Context.getEventForwarder() != null) {