From 4dc602d8a7700924b0117424533046b28f4a8df4 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 30 May 2022 18:39:50 -0700
Subject: Combine active device and session

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

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

diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index 0e5056e57..b1ea0b8b7 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -68,7 +68,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
     }
 
     @Override
-    public long addUnknownDevice(String uniqueId) {
+    public Device addUnknownDevice(String uniqueId) {
         Device device = new Device();
         device.setName(uniqueId);
         device.setUniqueId(uniqueId);
@@ -89,10 +89,10 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
                 Context.getPermissionsManager().refreshAllExtendedPermissions();
             }
 
-            return device.getId();
+            return device;
         } catch (StorageException e) {
             LOGGER.warn("Automatic device registration error", e);
-            return 0;
+            return null;
         }
     }
 
-- 
cgit v1.2.3