Remove extended client protocol

app/src/main/java/org/traccar/client/MainActivity.java

@@ -37,7 +37,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     public static final String KEY_PORT = "port";
     public static final String KEY_INTERVAL = "interval";
     public static final String KEY_PROVIDER = "provider";
-    public static final String KEY_EXTENDED = "extended";
     public static final String KEY_STATUS = "status";
 
     @Override
@@ -70,7 +69,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         preferenceScreen.findPreference(KEY_PORT).setEnabled(enabled);
         preferenceScreen.findPreference(KEY_INTERVAL).setEnabled(enabled);
         preferenceScreen.findPreference(KEY_PROVIDER).setEnabled(enabled);
-        preferenceScreen.findPreference(KEY_EXTENDED).setEnabled(enabled);
     }
 
     @Override

app/src/main/java/org/traccar/client/ProtocolFormatter.java

@@ -63,35 +63,22 @@ public class ProtocolFormatter {
     /**
      * Format location message
      */
-    public static String createLocationMessage(boolean extended, Location l, double battery) {
+    public static String createLocationMessage(Location l, double battery) {
-        StringBuilder s = new StringBuilder(extended ? "$TRCCR," : "$GPRMC,");
+        StringBuilder s = new StringBuilder("$GPRMC,");
         Formatter f = new Formatter(s, Locale.ENGLISH);
         Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ENGLISH);
         calendar.setTimeInMillis(l.getTime());
 
-        if (extended) {
+        f.format("%1$tH%1$tM%1$tS.%1$tL,A,", calendar);
 
-            f.format("%1$tY%1$tm%1$td%1$tH%1$tM%1$tS.%1$tL,A,", calendar);
+        double lat = l.getLatitude();
+        double lon = l.getLongitude();
+        f.format("%02d%07.4f,%c,", (int) Math.abs(lat), Math.abs(lat) % 1 * 60, lat < 0 ? 'S' : 'N');
+        f.format("%03d%07.4f,%c,", (int) Math.abs(lon), Math.abs(lon) % 1 * 60, lon < 0 ? 'W' : 'E');
 
-            f.format("%.6f,%.6f,", l.getLatitude(), l.getLongitude());
+        double speed = l.getSpeed() * 1.943844; // speed in knots
-            f.format("%.2f,%.2f,", l.getSpeed() * 1.943844, l.getBearing());
+        f.format("%.2f,%.2f,", speed, l.getBearing());
-            f.format("%.2f,", l.getAltitude());
+        f.format("%1$td%1$tm%1$ty,,", calendar);
-            f.format("%.0f,", battery);
-
-        } else {
-
-            f.format("%1$tH%1$tM%1$tS.%1$tL,A,", calendar);
-
-            double lat = l.getLatitude();
-            double lon = l.getLongitude();
-            f.format("%02d%07.4f,%c,", (int) Math.abs(lat), Math.abs(lat) % 1 * 60, lat < 0 ? 'S' : 'N');
-            f.format("%03d%07.4f,%c,", (int) Math.abs(lon), Math.abs(lon) % 1 * 60, lon < 0 ? 'W' : 'E');
-
-            double speed = l.getSpeed() * 1.943844; // speed in knots
-            f.format("%.2f,%.2f,", speed, l.getBearing());
-            f.format("%1$td%1$tm%1$ty,,", calendar);
-
-        }
 
         byte checksum = 0;
         for (byte b : s.substring(1).getBytes()) {

app/src/main/java/org/traccar/client/TrackingService.java

@@ -40,7 +40,6 @@ public class TrackingService extends Service implements PositionProvider.Positio
     private int port;
     private int interval;
     private String provider;
-    private boolean extended;
 
     private ClientController clientController;
     private PositionProvider positionProvider;
@@ -63,7 +62,6 @@ public class TrackingService extends Service implements PositionProvider.Positio
             provider = sharedPreferences.getString(MainActivity.KEY_PROVIDER, null);
             port = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_PORT, null));
             interval = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_INTERVAL, null));
-            extended = sharedPreferences.getBoolean(MainActivity.KEY_EXTENDED, false);
         } catch (Exception error) {
             Log.w(LOG_TAG, error);
         }
@@ -99,7 +97,7 @@ public class TrackingService extends Service implements PositionProvider.Positio
     public void onPositionUpdate(Position position) {
         if (position != null) {
             StatusActivity.addMessage(getString(R.string.status_location_update));
-            clientController.setNewLocation(ProtocolFormatter.createLocationMessage(extended, position.location, 0));
+            clientController.setNewLocation(ProtocolFormatter.createLocationMessage(position.location, 0));
         }
     }
 

app/src/main/res/values-cs/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Zastaveno</string>
     <string name="settings_status_on_summary">Spuštěno</string>
-    <string name="settings_extended_title">Rozšířené formát</string>
-    <string name="settings_extended_summary">Použijte nový formát zprávy</string>
     <string name="settings_provider_title">Poskytovatel zaměření</string>
     <string name="settings_provider_summary">Zdroj zaměřovacích dat</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-da/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Service stoppet</string>
     <string name="settings_status_on_summary">Service er aktiv</string>
-    <string name="settings_extended_title">Udvidet format</string>
-    <string name="settings_extended_summary">Brug ny besked format</string>
     <string name="settings_provider_title">Udbyder</string>
     <string name="settings_provider_summary">Udbyder lokaliseringsdata</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-de/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Dienst inaktiv</string>
     <string name="settings_status_on_summary">Dienst aktiv</string>
-    <string name="settings_extended_title">Erweitertes Format</string>
-    <string name="settings_extended_summary">Verwenden Sie das neue Nachrichtenformat</string>
     <string name="settings_provider_title">Datenherkunft</string>
     <string name="settings_provider_summary">Quelle der Positionen</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-es/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Desactivado</string>
     <string name="settings_status_off_summary">Servicio parado</string>
     <string name="settings_status_on_summary">Servicio activado</string>
-    <string name="settings_extended_title">Formato extendido</string>
-    <string name="settings_extended_summary">Utilice el nuevo formato de mensaje</string>
     <string name="settings_provider_title">Proveedor de localización</string>
     <string name="settings_provider_summary">Fuente de los datos de localización</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-fr/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Arrêter</string>
     <string name="settings_status_off_summary">Arrêté</string>
     <string name="settings_status_on_summary">En marche</string>
-    <string name="settings_extended_title">Format étendu</string>
-    <string name="settings_extended_summary">Utilisez un nouveau format de message</string>
     <string name="settings_provider_title">Source de localisation</string>
     <string name="settings_provider_summary">Source utilisée par le système afin d\'obtenir la localisation de l\'appareil</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-nb/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Stopp</string>
     <string name="settings_status_off_summary">Tjenesten stoppet</string>
     <string name="settings_status_on_summary">Tjenesten kjører</string>
-    <string name="settings_extended_title">Utvidet format</string>
-    <string name="settings_extended_summary">Bruk det nye utvidede formatet</string>
     <string name="settings_provider_title">Lokaliseringsleverandør</string>
     <string name="settings_provider_summary">Kilde for lokaliseringsdata</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-pt/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Parar</string>
     <string name="settings_status_off_summary">Serviço Parado</string>
     <string name="settings_status_on_summary">Serviço em execução</string>
-    <string name="settings_extended_title">Formato prolongado</string>
-    <string name="settings_extended_summary">Use o formato de mensagem nova</string>
     <string name="settings_provider_title">Provedor de localização</string>
     <string name="settings_provider_summary">Fonte dos dados de localização</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-ru/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Стоп</string>
     <string name="settings_status_off_summary">Сервис остановлен</string>
     <string name="settings_status_on_summary">Сервис запущен</string>
-    <string name="settings_extended_title">Расширенный формат</string>
-    <string name="settings_extended_summary">Использовать новый формат сообщений</string>
     <string name="settings_provider_title">Провайдер местоположения</string>
     <string name="settings_provider_summary">Источник данных о местоположении</string>
     <string-array name="settings_provider_names">

app/src/main/res/values-sr/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Servis zaustavljen</string>
     <string name="settings_status_on_summary">Servis pokrenut</string>
-    <string name="settings_extended_title">Produžen format</string>
-    <string name="settings_extended_summary">Koristi novi format za poruke</string>
     <string name="settings_provider_title">Provajder lokacije</string>
     <string name="settings_provider_summary">Izvor lokacijskih podataka</string>
     <string-array name="settings_provider_names">

app/src/main/res/values/strings.xml

@@ -16,8 +16,6 @@
     <string name="settings_status_on">Stop</string>
     <string name="settings_status_off_summary">Service stopped</string>
     <string name="settings_status_on_summary">Service running</string>
-    <string name="settings_extended_title">Extended format</string>
-    <string name="settings_extended_summary">Use new message format</string>
     <string name="settings_provider_title">Location provider</string>
     <string name="settings_provider_summary">Source of location data</string>
     <string-array name="settings_provider_names">

app/src/main/res/xml-v14/preferences.xml

@@ -42,10 +42,4 @@
         android:summary="@string/settings_provider_summary"
         android:title="@string/settings_provider_title" />
 
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="extended"
-        android:summary="@string/settings_extended_summary"
-        android:title="@string/settings_extended_title" />
-
 </PreferenceScreen>

app/src/main/res/xml/preferences.xml

@@ -40,10 +40,4 @@
         android:summary="@string/settings_provider_summary"
         android:title="@string/settings_provider_title" />
 
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="extended"
-        android:summary="@string/settings_extended_summary"
-        android:title="@string/settings_extended_title" />
-
 </PreferenceScreen>