Update version number

.idea/.name

@@ -1 +1 @@
-traccar-client
+traccar-client-android

.idea/gradle.xml

@@ -3,8 +3,14 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/traccar-client" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,8 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
+  <component name="RunManager">
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
+    <list size="0" />
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">

.idea/vcs.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
 

build.gradle

@@ -1 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.8.+'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}

gradle.properties

@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Oct 28 17:05:17 NZDT 2013
+#Sun Jan 26 19:02:25 NZDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

traccar-client-android.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

traccar-client/build.gradle

@@ -1,25 +1,42 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
-    }
-}
 apply plugin: 'android'
 
-repositories {
-    mavenCentral()
-}
-
 android {
-    compileSdkVersion 17
+    compileSdkVersion 19
-    buildToolsVersion "17.0.0"
+    buildToolsVersion "19.0.1"
 
     defaultConfig {
         minSdkVersion 3
-        targetSdkVersion 18
+        targetSdkVersion 19
+        versionCode 16
+        versionName "2.9"
     }
+
+    signingConfigs {
+        release {
+            storeFile file('/home/user/Documents/android.keystore')
+            keyAlias "tananaev"
+        }
+    }
+
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name == 'validateReleaseSigning') {
+        task.dependsOn keystoreInfo
+    }
+}
+
+task keystoreInfo << {
+    def password = System.console().readPassword('\n\nKeystore password: ')
+    android.signingConfigs.release.storePassword = new String(password)
+    android.signingConfigs.release.keyPassword = new String(password)
 }
 
 dependencies {

traccar-client/proguard-rules.txt

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/user/android-studio/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

traccar-client/src/main/AndroidManifest.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.traccar.client"
+    package="org.traccar.client">
-    android:versionCode="15"
-    android:versionName="2.8">
 
-    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="18" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"></uses-permission>
-    <uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
     
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true">
         

traccar-client/src/main/java/org/traccar/client/ClientController.java

@@ -18,8 +18,13 @@ package org.traccar.client;
 import java.util.LinkedList;
 import java.util.Queue;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
 import android.os.Handler;
+import android.util.Log;
 
 
 public class ClientController implements Connection.ConnectionHandler {
@@ -45,13 +50,30 @@ public class ClientController implements Connection.ConnectionHandler {
         this.loginMessage = loginMessage;
     }
 
+    private BroadcastReceiver connectivityListener = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
+                handler.removeCallbacksAndMessages(null);
+            } else {
+                reconnect();
+            }
+        }
+    };
+
     public void start() {
         handler = new Handler();
         connection = new Connection(this);
         connection.connect(address, port);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(connectivityListener, filter);
     }
 
     public void stop() {
+        context.unregisterReceiver(connectivityListener);
+
         connection.close();
         handler.removeCallbacksAndMessages(null);
     }

traccar-client/src/main/java/org/traccar/client/PositionProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,6 @@ public class PositionProvider {
         public void onPositionUpdate(Location location);
     }
     
-    private final Context context;
-
     private final Handler handler;
     private final LocationManager locationManager;
     private final long period;
@@ -46,8 +44,7 @@ public class PositionProvider {
     private boolean useCoarse;
 
     public PositionProvider(Context context, String type, long period, PositionListener listener) {
-    	this.context = context; 
+        handler = new Handler(context.getMainLooper());
-        handler = new Handler(this.context.getMainLooper());
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
         this.period = period;
         this.listener = listener;

traccar-client/src/main/java/org/traccar/client/Protocol.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,12 +49,23 @@ public class Protocol {
     /**
      * Format location message
      */
-    public static String createLocationMessage(Location l) {
+    public static String createLocationMessage(boolean extended, Location l, double battery) {
-        StringBuilder s = new StringBuilder("$GPRMC,");
+        StringBuilder s = new StringBuilder(extended ? "$TRCCR," : "$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$tY%1$tm%1$td%1$tH%1$tM%1$tS.%1$tL,A,", calendar);
+
+            f.format("%.6f,%.6f,", l.getLatitude(), l.getLongitude());
+            f.format("%.2f,%.2f,", l.getSpeed() * 1.943844, l.getBearing());
+            f.format("%.2f,", l.getAltitude());
+            f.format("%.0f,", battery);
+
+        } else {
+
             f.format("%1$tH%1$tM%1$tS.%1$tL,A,", calendar);
 
             double lat = l.getLatitude();
@@ -66,6 +77,8 @@ public class Protocol {
             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()) {
             checksum ^= b;

traccar-client/src/main/java/org/traccar/client/TraccarActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ public class TraccarActivity extends PreferenceActivity {
     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

traccar-client/src/main/java/org/traccar/client/TraccarService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,16 @@
  */
 package org.traccar.client;
 
+import android.annotation.TargetApi;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.location.Location;
+import android.os.BatteryManager;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
@@ -39,6 +43,7 @@ public class TraccarService extends Service {
     private int port;
     private int interval;
     private String provider;
+    private boolean extended;
 
     private SharedPreferences sharedPreferences;
     private ClientController clientController;
@@ -66,6 +71,7 @@ public class TraccarService extends Service {
             provider = sharedPreferences.getString(TraccarActivity.KEY_PROVIDER, null);
             port = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_PORT, null));
             interval = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_INTERVAL, null));
+            extended = sharedPreferences.getBoolean(TraccarActivity.KEY_EXTENDED, false);
         } catch (Exception error) {
             Log.w(LOG_TAG, error);
         }
@@ -79,6 +85,7 @@ public class TraccarService extends Service {
         sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
     }
 
+    @TargetApi(Build.VERSION_CODES.ECLAIR)
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
     	onStart(intent, startId);
@@ -109,13 +116,20 @@ public class TraccarService extends Service {
         wakeLock.release();
     }
 
+    public double getBatteryLevel() {
+        Intent batteryIntent = registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+        int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 1);
+        return (level * 100.0) / scale;
+    }
+
     private PositionProvider.PositionListener positionListener = new PositionProvider.PositionListener() {
 
         @Override
         public void onPositionUpdate(Location location) {
             if (location != null) {
                 StatusActivity.addMessage(getString(R.string.status_location_update));
-                clientController.setNewLocation(Protocol.createLocationMessage(location));
+                clientController.setNewLocation(Protocol.createLocationMessage(extended, location, getBatteryLevel()));
             }
         }
 
@@ -156,6 +170,10 @@ public class TraccarService extends Service {
                     positionProvider = new PositionProvider(TraccarService.this, provider, interval * 1000, positionListener);
                     positionProvider.startUpdates();
 
+                } else if (key.equals(TraccarActivity.KEY_EXTENDED)) {
+
+                    extended = sharedPreferences.getBoolean(TraccarActivity.KEY_EXTENDED, false);
+
                 }
             } catch (Exception error) {
                 Log.w(LOG_TAG, error);

traccar-client/src/main/res/values-cs/strings.xml

@@ -16,6 +16,8 @@
     <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">

traccar-client/src/main/res/values-da/strings.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar klient</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Indentificere Enhed</string>
+    <string name="settings_address_title">Server adresse</string>
+    <string name="settings_address_summary">Domænenavn eller IP adresse</string>
+    <string name="settings_port_title">Server port</string>
+    <string name="settings_port_summary">Tracking server TCP port</string>
+    <string name="settings_interval_title">Tracking interval</string>
+    <string name="settings_interval_summary">Besked interval i sekunder</string>
+    <string name="settings_status_title">Service status</string>
+    <string name="settings_status_off">Start</string>
+    <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">
+        <item>GPS udbyder</item>
+        <item>Netværks udbyder</item>
+        <item>Mixet udbyder</item>
+    </string-array>
+
+    <string name="menu_status">Status</string>
+    <string name="menu_about">Om</string>
+    <string name="menu_clear">Tilbage</string>
+
+    <string name="about_description">Real tid`s GPS tracker for Android enheder. Kompatibel med Traccar Server og andre tracking systemer.</string>
+    <string name="about_license">Denne application er en fri og open source, source koden er licenseret under Apache License Version 2.0 og tilgængelig på GitHub.</string>
+    <string name="about_web">For mere information besøg\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Service oprettet</string>
+    <string name="status_service_start">Service startet</string>
+    <string name="status_service_destroy">Service ødelagt</string>
+    <string name="status_connection_success">Forbindelse lykkedes</string>
+    <string name="status_connection_fail">Forbindelse fejlet</string>
+    <string name="status_send_fail">Send fejl</string>
+    <string name="status_location_update">Placering opdateret</string>
+    <string name="status_preference_update">Oplysninger opdateret</string>
+
+</resources>

traccar-client/src/main/res/values-de/strings.xml

@@ -16,6 +16,8 @@
     <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">Erweiterte Format</string>
+    <string name="settings_extended_summary">Verwenden Sie 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">

traccar-client/src/main/res/values-es/strings.xml

@@ -16,6 +16,8 @@
     <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">

traccar-client/src/main/res/values-fr/strings.xml

@@ -16,6 +16,8 @@
     <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">

traccar-client/src/main/res/values-pt/strings.xml

@@ -16,6 +16,8 @@
     <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">

traccar-client/src/main/res/values-ru/strings.xml

@@ -16,6 +16,8 @@
     <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">

traccar-client/src/main/res/values/strings.xml

@@ -16,6 +16,8 @@
     <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">

traccar-client/src/main/res/xml-v14/preferences.xml

@@ -33,6 +33,12 @@
         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" />
+
     <SwitchPreference
         android:defaultValue="false"
         android:key="status"

traccar-client/src/main/res/xml/preferences.xml

@@ -33,6 +33,12 @@
         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" />
+
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="status"

traccar-client/traccar-client.iml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="traccar-client-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="Debug" />
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -25,37 +25,37 @@
     <output url="file://$MODULE_DIR$/build/classes/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
@@ -64,6 +64,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>