- Rename otherUserId to managedUserId

- Optimize getManaged* functions

1 files changed, 4 insertions, 4 deletions

diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index bcb3185ca..8e75903db 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -163,8 +163,8 @@ public class DeviceManager implements IdentityManager {
     public Collection<Device> getManagedDevices(long userId) throws SQLException {
         Collection<Device> devices = new ArrayList<>();
         devices.addAll(getDevices(userId));
-        for (long otherUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
-            devices.addAll(getDevices(otherUserId));
+        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
+            devices.addAll(getDevices(managedUserId));
         }
         return devices;
     }
@@ -301,8 +301,8 @@ public class DeviceManager implements IdentityManager {
     public Collection<Group> getManagedGroups(long userId) throws SQLException {
         Collection<Group> groups = new ArrayList<>();
         groups.addAll(getGroups(userId));
-        for (long otherUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
-            groups.addAll(getGroups(otherUserId));
+        for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
+            groups.addAll(getGroups(managedUserId));
         }
         return groups;
     }