1 files changed, 15 insertions, 1 deletions
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index 92fcc3ebd..3c2cc252b 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -41,6 +41,7 @@ public class PermissionsManager {
     private final Map<Long, Set<Long>> groupPermissions = new HashMap<>();
     private final Map<Long, Set<Long>> devicePermissions = new HashMap<>();
     private final Map<Long, Set<Long>> deviceUsers = new HashMap<>();
+    private final Map<Long, Set<Long>> groupDevices = new HashMap<>();
 
     public Set<Long> getGroupPermissions(long userId) {
         if (!groupPermissions.containsKey(userId)) {
@@ -63,6 +64,13 @@ public class PermissionsManager {
         return deviceUsers.get(deviceId);
     }
 
+    public Set<Long> getGroupDevices(long groupId) {
+        if (!groupDevices.containsKey(groupId)) {
+            groupDevices.put(groupId, new HashSet<Long>());
+        }
+        return groupDevices.get(groupId);
+    }
+
     public PermissionsManager(DataManager dataManager) {
         this.dataManager = dataManager;
         refresh();
@@ -91,11 +99,17 @@ public class PermissionsManager {
                     userDevicePermissions.add(device.getId());
                 }
             }
-
             for (DevicePermission permission : dataManager.getDevicePermissions()) {
                 getDevicePermissions(permission.getUserId()).add(permission.getDeviceId());
             }
 
+            groupDevices.clear();
+            for (Group group : Context.getDeviceManager().getAllGroups()) {
+                for (Device device : groupTree.getDevices(group.getId())) {
+                    getGroupDevices(group.getId()).add(device.getId());
+                }
+            }
+
         } catch (SQLException error) {
             Log.warning(error);
         }