Concept update + UI translation support

2 files changed, 45 insertions, 7 deletions

diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index 90d3ef675..f7494aa6a 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -87,11 +87,4 @@ public class DeviceResource extends BaseResource {
         return Response.noContent().build();
     }
 
-    @Path("{id}/supportedcommands")
-    @GET
-    public Collection<SupportedCommand> get(@PathParam("id") long id) throws SQLException {
-        Context.getPermissionsManager().checkDevice(getUserId(), id);
-        Position latestPosition = Context.getDataManager().getLatestPosition(id);
-        return Context.getServerManager().getProtocolSuppportedCommands(latestPosition.getProtocol());
-    }
 }
diff --git a/src/org/traccar/api/resource/SupportedCommandResource.java b/src/org/traccar/api/resource/SupportedCommandResource.java
new file mode 100644
index 000000000..849447060
--- /dev/null
+++ b/src/org/traccar/api/resource/SupportedCommandResource.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.Position;
+import org.traccar.model.SupportedCommand;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Collections;
+
+@Path("supportedcommands")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class SupportedCommandResource extends BaseResource {
+
+    @GET
+    public Collection<SupportedCommand> get(@QueryParam("deviceId") long deviceId) throws SQLException {
+        Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+        Position latestPosition = Context.getDataManager().getLatestPosition(deviceId);
+        if (latestPosition != null) {
+            return Context.getServerManager().getProtocolSuppportedCommands(latestPosition.getProtocol());
+        } else {
+            return Collections.EMPTY_LIST;
+        }
+    }
+
+}