Merge branch 'master' into develop

1 files changed, 22 insertions, 8 deletions

diff --git a/src/main/java/org/traccar/BaseProtocol.java b/src/main/java/org/traccar/BaseProtocol.java
index bd3391822..d19fc307e 100644
--- a/src/main/java/org/traccar/BaseProtocol.java
+++ b/src/main/java/org/traccar/BaseProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2022 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,10 @@ import io.netty.channel.Channel;
 import io.netty.handler.codec.string.StringEncoder;
 import org.traccar.helper.DataConverter;
 import org.traccar.model.Command;
+import org.traccar.sms.SmsManager;
 
+import javax.annotation.Nullable;
+import javax.inject.Inject;
 import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.Collection;
@@ -35,7 +38,9 @@ public abstract class BaseProtocol implements Protocol {
     private final String name;
     private final Set<String> supportedDataCommands = new HashSet<>();
     private final Set<String> supportedTextCommands = new HashSet<>();
-    private final List<TrackerServer> serverList = new LinkedList<>();
+    private final List<TrackerConnector> connectorList = new LinkedList<>();
+
+    private SmsManager smsManager;
 
     private StringProtocolEncoder textCommandEncoder = null;
 
@@ -48,18 +53,27 @@ public abstract class BaseProtocol implements Protocol {
         name = nameFromClass(getClass());
     }
 
+    @Inject
+    public void setSmsManager(@Nullable SmsManager smsManager) {
+        this.smsManager = smsManager;
+    }
+
     @Override
     public String getName() {
         return name;
     }
 
     protected void addServer(TrackerServer server) {
-        serverList.add(server);
+        connectorList.add(server);
+    }
+
+    protected void addClient(TrackerClient client) {
+        connectorList.add(client);
     }
 
     @Override
-    public Collection<TrackerServer> getServerList() {
-        return serverList;
+    public Collection<TrackerConnector> getConnectorList() {
+        return connectorList;
     }
 
     public void setSupportedDataCommands(String... commands) {
@@ -107,13 +121,13 @@ public abstract class BaseProtocol implements Protocol {
 
     @Override
     public void sendTextCommand(String destAddress, Command command) throws Exception {
-        if (Context.getSmsManager() != null) {
+        if (smsManager != null) {
             if (command.getType().equals(Command.TYPE_CUSTOM)) {
-                Context.getSmsManager().sendMessageSync(destAddress, command.getString(Command.KEY_DATA), true);
+                smsManager.sendMessage(destAddress, command.getString(Command.KEY_DATA), true);
             } else if (supportedTextCommands.contains(command.getType()) && textCommandEncoder != null) {
                 String encodedCommand = (String) textCommandEncoder.encodeCommand(command);
                 if (encodedCommand != null) {
-                    Context.getSmsManager().sendMessageSync(destAddress, encodedCommand, true);
+                    smsManager.sendMessage(destAddress, encodedCommand, true);
                 } else {
                     throw new RuntimeException("Failed to encode command");
                 }