From d3e83f9fa0d066e5a15fde225599cc43071c031a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Thu, 16 Jun 2022 07:09:00 -0700
Subject: Remove groups manager

---
 src/main/java/org/traccar/database/PermissionsManager.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/traccar/database/PermissionsManager.java')

diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index 833480eea..595e236fa 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -162,9 +162,8 @@ public class PermissionsManager {
             groupPermissions.clear();
             devicePermissions.clear();
             try {
-                GroupTree groupTree = new GroupTree(Context.getGroupsManager().getItems(
-                        Context.getGroupsManager().getAllItems()),
-                        Context.getDeviceManager().getAllDevices());
+                var groups = dataManager.getObjects(Group.class);
+                GroupTree groupTree = new GroupTree(groups, Context.getDeviceManager().getAllDevices());
                 for (Permission groupPermission : dataManager.getPermissions(User.class, Group.class)) {
                     Set<Long> userGroupPermissions = getGroupPermissions(groupPermission.getOwnerId());
                     Set<Long> userDevicePermissions = getDevicePermissions(groupPermission.getOwnerId());
@@ -182,9 +181,9 @@ public class PermissionsManager {
                 }
 
                 groupDevices.clear();
-                for (long groupId : Context.getGroupsManager().getAllItems()) {
-                    for (Device device : groupTree.getDevices(groupId)) {
-                        getGroupDevices(groupId).add(device.getId());
+                for (var group : groups) {
+                    for (Device device : groupTree.getDevices(group.getId())) {
+                        getGroupDevices(group.getId()).add(device.getId());
                     }
                 }
 
-- 
cgit v1.2.3