Remove BaseProtocolSmsEncoder class

Add fallback to SMS if device is not online
Use more variables and ternary operators

2 files changed, 6 insertions, 11 deletions

diff --git a/src/org/traccar/protocol/GranitProtocolSmsEncoder.java b/src/org/traccar/protocol/GranitProtocolSmsEncoder.java
index 05954d550..668e5d4d3 100644
--- a/src/org/traccar/protocol/GranitProtocolSmsEncoder.java
+++ b/src/org/traccar/protocol/GranitProtocolSmsEncoder.java
@@ -16,14 +16,14 @@
  */
 package org.traccar.protocol;
 
-import org.traccar.BaseProtocolSmsEncoder;
+import org.traccar.StringProtocolEncoder;
 import org.traccar.helper.Log;
 import org.traccar.model.Command;
 
-public class GranitProtocolSmsEncoder extends BaseProtocolSmsEncoder {
+public class GranitProtocolSmsEncoder extends StringProtocolEncoder {
 
     @Override
-    protected String encodeSmsCommand(Command command) {
+    protected String encodeCommand(Command command) {
         switch (command.getType()) {
         case Command.TYPE_REBOOT_DEVICE:
             return "BB+RESET";
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
index ddb5c1475..8f9887b10 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 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.
@@ -15,11 +15,11 @@
  */
 package org.traccar.protocol;
 
-import org.traccar.BaseProtocolSmsEncoder;
+import org.traccar.StringProtocolEncoder;
 import org.traccar.helper.Log;
 import org.traccar.model.Command;
 
-public class WondexProtocolEncoder extends BaseProtocolSmsEncoder {
+public class WondexProtocolEncoder extends StringProtocolEncoder {
     @Override
     protected Object encodeCommand(Command command) {
 
@@ -40,9 +40,4 @@ public class WondexProtocolEncoder extends BaseProtocolSmsEncoder {
         return null;
     }
 
-    @Override
-    protected String encodeSmsCommand(Command command) {
-        return (String) encodeCommand(command);
-    }
-
 }