From 408758d371eaeb2ce25c1e8214f591200e741aaf Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 13 Jun 2015 17:41:04 +1200
Subject: Fix minor permissions issues

---
 src/org/traccar/database/DataManager.java        | 4 +++-
 src/org/traccar/database/PermissionsManager.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index bab785a96..4b9aacbbf 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -168,7 +168,9 @@ public class DataManager {
         admin.setEmail("admin");
         admin.setPassword("admin");
         admin.setAdmin(true);
-        addUser(admin);
+        QueryBuilder.create(dataSource, properties.getProperty("database.insertUser"))
+                .setObject(admin)
+                .executeUpdate();
         
         Server server = new Server();
         server.setRegistration(true);
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index f34fecb08..683f54cb4 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -75,7 +75,7 @@ public class PermissionsManager {
     }
     
     public void checkDevice(long userId, long deviceId) throws SecurityException {
-        if (getNotNull(userId).contains(deviceId)) {
+        if (!getNotNull(userId).contains(deviceId)) {
             throw new SecurityException("Device access denied");
         }
     }
-- 
cgit v1.2.3