From 68af658ea2ff9593e5be7a2b2cfcb75c744fd749 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 25 Jul 2017 10:53:08 +0500
Subject: Move users management to separate manager

---
 src/org/traccar/Context.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/org/traccar/Context.java')

diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index a4fc5b679..47472b1d4 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -38,6 +38,7 @@ import org.traccar.database.NotificationManager;
 import org.traccar.database.PermissionsManager;
 import org.traccar.database.GeofenceManager;
 import org.traccar.database.StatisticsManager;
+import org.traccar.database.UsersManager;
 import org.traccar.geocoder.BingMapsGeocoder;
 import org.traccar.geocoder.FactualGeocoder;
 import org.traccar.geocoder.GeocodeFarmGeocoder;
@@ -98,6 +99,12 @@ public final class Context {
         return mediaManager;
     }
 
+    private static UsersManager usersManager;
+
+    public static UsersManager getUsersManager() {
+        return usersManager;
+    }
+
     private static DeviceManager deviceManager;
 
     public static DeviceManager getDeviceManager() {
@@ -232,6 +239,10 @@ public final class Context {
             mediaManager = new MediaManager(config);
         }
 
+        if (dataManager != null) {
+            usersManager = new UsersManager(dataManager);
+        }
+
         if (dataManager != null) {
             deviceManager = new DeviceManager(dataManager);
         }
@@ -298,7 +309,7 @@ public final class Context {
             webServer = new WebServer(config, dataManager.getDataSource());
         }
 
-        permissionsManager = new PermissionsManager(dataManager);
+        permissionsManager = new PermissionsManager(dataManager, usersManager);
 
         connectionManager = new ConnectionManager();
 
-- 
cgit v1.2.3