2 files changed, 84 insertions, 11 deletions

diff --git a/src/main/java/org/traccar/notificators/NotificatorPushover.java b/src/main/java/org/traccar/notificators/NotificatorPushover.java
index ff992ec8d..ae48bd46a 100644
--- a/src/main/java/org/traccar/notificators/NotificatorPushover.java
+++ b/src/main/java/org/traccar/notificators/NotificatorPushover.java
@@ -23,6 +23,10 @@ import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.notification.NotificationFormatter;
 
+import org.traccar.model.User;
+import org.traccar.notification.PropertiesProvider;
+import java.util.Properties;
+
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.InvocationCallback;
 
@@ -30,9 +34,36 @@ public class NotificatorPushover extends Notificator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NotificatorPushover.class);
 
-    private String url;
+    private static Properties getProperties(PropertiesProvider provider) {
+        Properties properties = new Properties();
+        // (required) token from pushover.net
+        String token = provider.getString("notificator.pushover.token");
+        if (token != null) {
+            properties.put("notificator.pushover.token", token);
+        }
+        // (required) user from pushover.net
+        String user = provider.getString("notificator.pushover.user");
+        if (user != null) {
+            properties.put("notificator.pushover.user", user);
+        }
+        // optional: your user's device name to send the message directly
+        // to that device, rather than all of the user's devices (multiple devices may be separated by a comma)
+        String device = provider.getString("notificator.pushover.device");
+        if (device != null) {
+            properties.put("notificator.pushover.device", device);
+        }
+        // optional: your message's title, otherwise your app's name is used
+        String title = provider.getString("notificator.pushover.title");
+        if (title != null) {
+            properties.put("notificator.pushover.title", title);
+        }
+        return properties;
+    }
+
+
+    private final String url;
     private String token;
-    private String user;
+    private String puser;
     private String device;
     private String title;
 
@@ -50,23 +81,65 @@ public class NotificatorPushover extends Notificator {
     }
 
     public NotificatorPushover() {
-        url = "https://api.pushover.net/1/messages.json";
         // see https://pushover.net/api
-        token = Context.getConfig().getString("notificator.pushover.token"); // (required) token from pushover.net
-        user = Context.getConfig().getString("notificator.pushover.user"); // (required) user from pushover.net
-        device = Context.getConfig().getString("notificator.pushover.device", ""); // optional:
-        // your user's device name to send the message directly
-        // to that device, rather than all of the user's devices (multiple devices may be separated by a comma)
-        title = Context.getConfig().getString("notificator.pushover.title", ""); // optional: your message's title,
-        // otherwise your app's name is used
+        url = "https://api.pushover.net/1/messages.json";
     }
 
     @Override
     public void sendSync(long userId, Event event, Position position) {
 
+        User user = Context.getPermissionsManager().getUser(userId);
+
+        token = null;
+        puser = null;
+        device = null;
+        title = null;
+
+        Properties properties = null;
+
+        properties = getProperties(new PropertiesProvider(Context.getConfig()));
+        if (properties != null) {
+            token = properties.getProperty("notificator.pushover.token");
+            puser = properties.getProperty("notificator.pushover.user");
+            device = properties.getProperty("notificator.pushover.device");
+            title = properties.getProperty("notificator.pushover.title");
+        }
+
+        properties = getProperties(new PropertiesProvider(user));
+        if (properties != null) {
+            if (properties.getProperty("notificator.pushover.token") != null) {
+                token = properties.getProperty("notificator.pushover.token");
+            }
+            if (properties.getProperty("notificator.pushover.user") != null) {
+                puser = properties.getProperty("notificator.pushover.user");
+            }
+            if (properties.getProperty("notificator.pushover.device") != null) {
+                device = properties.getProperty("notificator.pushover.device");
+            }
+            if (properties.getProperty("notificator.pushover.title") != null) { 
+                title = properties.getProperty("notificator.pushover.title");
+            }
+        } 
+        
+        if (token == null) {
+            LOGGER.warn("Pushover token not found");
+            return;
+        }
+
+        if (puser == null) {
+            LOGGER.warn("Pushover user not found");
+            return;
+        }
+
+        if (device == null)
+            device = "";
+
+        if (title == null)
+            title = "";
+
         Message message = new Message();
         message.token = token;
-        message.user = user;
+        message.user = puser;
         message.device = device;
         message.title = title;
         message.message = NotificationFormatter.formatShortMessage(userId, event, position);
diff --git a/traccar-web b/traccar-web
-Subproject e8479d77f13acc3b3738a180a7990b06c495f1b
+Subproject a587d6257dd9de70252a5b00299ccbfd7b5cb27