Rename main app module

app/build.gradle

@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        minSdkVersion 3
+        targetSdkVersion 22
+        versionCode 22
+        versionName "3.2"
+    }
+
+    signingConfigs {
+        release {
+            storeFile file('/home/user/Documents/android.keystore')
+            keyAlias "tananaev"
+            storePassword ""
+            keyPassword ""
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+}

app/src/main/AndroidManifest.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.traccar.client">
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true" android:theme="@style/TraccarTheme">
+        
+        <activity android:name="TraccarActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="StatusActivity">
+        </activity>
+
+        <activity android:name="AboutActivity">
+        </activity>
+        
+        <service android:name="TraccarService" />
+        
+        <receiver android:name="AutostartReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+    
+    </application>
+
+</manifest>

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012 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.
+ * 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.client;
+
+import android.app.Activity;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class AboutActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about);
+
+        TextView title = (TextView) findViewById(R.id.title);
+        try {
+            title.setText(title.getText() + " " + getPackageManager().getPackageInfo(this.getPackageName(), 0).versionName);
+        } catch (NameNotFoundException e) {
+        }
+    }
+
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 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.
+ * 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.client;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class AutostartReceiver extends BroadcastReceiver {
+	
+	public static final String LOG_TAG = "Traccar.AutostartReceiver";
+ 
+    @Override
+    public void onReceive(Context context, Intent intent) {
+    	SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+    	if (sharedPreferences.getBoolean(TraccarActivity.KEY_STATUS, false)) {
+    		context.startService(new Intent(context, TraccarService.class));
+    	}
+    }
+
+}

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

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2013 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.
+ * 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.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 {
+
+    public static final long RECONNECT_DELAY = 10 * 1000;
+
+    private Context context;
+
+    private Handler handler;
+    private Queue<String> messageQueue;
+
+    private Connection connection;
+
+    private String address;
+    private int port;
+    private String loginMessage;
+
+    public ClientController(Context context, String address, int port, String loginMessage) {
+        this.context = context;
+        messageQueue = new LinkedList<String>();
+        this.address = address;
+        this.port = port;
+        this.loginMessage = loginMessage;
+    }
+
+    private BroadcastReceiver connectivityListener = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            StatusActivity.addMessage(context.getString(R.string.status_connectivity_change));
+            /*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);
+    }
+
+    private void reconnect() {
+        handler.removeCallbacksAndMessages(null);
+        connection.close();
+        connection = new Connection(this);
+        connection.connect(address, port);
+    }
+
+    private void delayedReconnect() {
+        connection.close();
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                connection = new Connection(ClientController.this);
+                connection.connect(address, port);
+            }
+        }, RECONNECT_DELAY);
+    }
+
+    public void setNewServer(String address, int port) {
+        this.address = address;
+        this.port = port;
+        reconnect();
+    }
+
+    public void setNewLogin(String loginMessage) {
+        this.loginMessage = loginMessage;
+        reconnect();
+    }
+
+    public void setNewLocation(String locationMessage) {
+        messageQueue.offer(locationMessage);
+        if (!connection.isClosed() && !connection.isBusy()) {
+            connection.send(messageQueue.poll());
+        }
+    }
+
+    @Override
+    public void onConnected(boolean result) {
+        if (result) {
+            StatusActivity.addMessage(context.getString(R.string.status_connection_success));
+            connection.send(loginMessage);
+        } else {
+            StatusActivity.addMessage(context.getString(R.string.status_connection_fail));
+            delayedReconnect();
+        }
+    }
+
+    @Override
+    public void onSent(boolean result) {
+        if (result) {
+            if (!messageQueue.isEmpty()) {
+                connection.send(messageQueue.poll());
+            }
+        } else {
+            StatusActivity.addMessage(context.getString(R.string.status_send_fail));
+            delayedReconnect();
+        }
+    }
+
+}

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

@@ -0,0 +1,157 @@
+/*
+ * Copyright 2012 - 2013 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.
+ * 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.client;
+
+import java.io.Closeable;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+/**
+ * Asynchronous connection
+ * 
+ * All methods should be called from UI thread only.
+ */
+public class Connection implements Closeable {
+
+    public static final String LOG_TAG = "Traccar.Connection";
+    public static final int SOCKET_TIMEOUT = 10 * 1000;
+
+    /**
+     * Callback interface
+     */
+    public interface ConnectionHandler {
+        void onConnected(boolean result);
+        void onSent(boolean result);
+    }
+
+    private ConnectionHandler handler;
+
+    private Socket socket;
+    private OutputStream socketStream;
+
+    private boolean closed;
+    private boolean busy;
+
+    public boolean isClosed() {
+        return closed;
+    }
+
+    public boolean isBusy() {
+        return busy;
+    }
+
+    public Connection(ConnectionHandler handler) {
+        this.handler = handler;
+        closed = false;
+        busy = false;
+    }
+
+    public void connect(final String address, final int port) {
+        busy = true;
+
+        new AsyncTask<Void, Void, Boolean>() {
+
+            @Override
+            protected Boolean doInBackground(Void... params) {
+                try {
+                    socket = new Socket();
+                    socket.connect(new InetSocketAddress(address, port));
+                    socket.setSoTimeout(SOCKET_TIMEOUT);
+                    socketStream = socket.getOutputStream();
+                    return true;
+                } catch (Exception e) {
+                    Log.w(LOG_TAG, e.getMessage());
+                    return false;
+                }
+            }
+
+            @Override
+            protected void onCancelled() {
+                if (!closed) {
+                    busy = false;
+                    handler.onConnected(false);
+                }
+            }
+
+            @Override
+            protected void onPostExecute(Boolean result) {
+                if (!closed) {
+                    busy = false;
+                    handler.onConnected(result);
+                }
+            }
+
+        }.execute();
+
+    }
+
+    public void send(String message) {
+        busy = true;
+
+        new AsyncTask<String, Void, Boolean>() {
+
+            @Override
+            protected Boolean doInBackground(String... params) {
+                try {
+                    socketStream.write(params[0].getBytes());
+                    socketStream.flush();
+                    return true;
+                } catch (Exception e) {
+                    Log.w(LOG_TAG, e.getMessage());
+                    return false;
+                }
+            }
+
+            @Override
+            protected void onCancelled() {
+                if (!closed) {
+                    busy = false;
+                    handler.onSent(false);
+                }
+            }
+
+            @Override
+            protected void onPostExecute(Boolean result) {
+                if (!closed) {
+                    busy = false;
+                    handler.onSent(result);
+                }
+            }
+
+        }.execute(message);
+
+    }
+
+    @Override
+    public void close() {
+        closed = true;
+        try {
+            if (socketStream != null) {
+                socketStream.close();
+            }
+            if (socket != null) {
+                socket.close();
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, e.getMessage());
+        }
+    }
+
+}

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright 2013 - 2015 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.
+ * 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.client;
+
+import java.util.Date;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.location.LocationProvider;
+import android.os.Bundle;
+import android.os.Handler;
+import android.widget.Toast;
+
+public class PositionProvider {
+
+    public static final String PROVIDER_MIXED = "mixed";
+    public static final long PERIOD_DELTA = 10 * 1000;
+    public static final long RETRY_PERIOD = 60 * 1000;
+
+    public interface PositionListener {
+        public void onPositionUpdate(Location location);
+    }
+    
+    private final Handler handler;
+    private final LocationManager locationManager;
+    private final long period;
+    private final PositionListener listener;
+    private final Context context;
+
+    private boolean useFine;
+    private boolean useCoarse;
+
+    public PositionProvider(Context context, String type, long period, PositionListener listener) {
+        handler = new Handler(context.getMainLooper());
+        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+        this.period = period;
+        this.listener = listener;
+        this.context = context;
+
+        // Determine providers
+        if (type.equals(PROVIDER_MIXED)) {
+            useFine = true;
+            useCoarse = true;
+        } else if (type.equals(LocationManager.GPS_PROVIDER)) {
+            useFine = true;
+        } else if (type.equals(LocationManager.NETWORK_PROVIDER)) {
+            useCoarse = true;
+        }
+    }
+
+    public void startUpdates() {
+        if (useFine) {
+            try {
+                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, period, 0, fineLocationListener);
+            } catch (Exception e) {
+                StatusActivity.addMessage(context.getString(R.string.status_provider_missing));
+            }
+        }
+        if (useCoarse) {
+            try {
+                locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, period, 0, coarseLocationListener);
+            } catch (Exception e) {
+                StatusActivity.addMessage(context.getString(R.string.status_provider_missing));
+            }
+        }
+        handler.postDelayed(updateTask, period);
+    }
+
+    public void stopUpdates() {
+        handler.removeCallbacks(updateTask);
+        locationManager.removeUpdates(fineLocationListener);
+        locationManager.removeUpdates(coarseLocationListener);
+    }
+
+    private final Runnable updateTask = new Runnable() {
+
+        private long lastTime;
+
+        private boolean tryProvider(String provider) {
+            Location location = locationManager.getLastKnownLocation(provider);
+
+            /*if (location != null) {
+                Toast.makeText(context, "phone: " + new Date() + "\ngps: " + new Date(location.getTime()), Toast.LENGTH_LONG).show();
+            } else {
+                Toast.makeText(context, "no location", Toast.LENGTH_LONG).show();
+            }*/
+            
+            if (location != null && location.getTime() != lastTime) {
+                lastTime = location.getTime();
+                listener.onPositionUpdate(location);
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public void run() {
+            if (useFine && tryProvider(LocationManager.GPS_PROVIDER)) {
+            } else if (useCoarse && tryProvider(LocationManager.NETWORK_PROVIDER)) {
+            } else {
+                listener.onPositionUpdate(null);
+            }
+            handler.postDelayed(this, period);
+        }
+
+    };
+
+    private final InternalLocationListener fineLocationListener = new InternalLocationListener();
+    private final InternalLocationListener coarseLocationListener = new InternalLocationListener();
+
+    private class InternalLocationListener implements LocationListener {
+
+        @Override
+        public void onLocationChanged(Location location) {
+        }
+
+        @Override
+        public void onProviderDisabled(String provider) {
+        }
+
+        @Override
+        public void onProviderEnabled(String provider) {
+        }
+
+        @Override
+        public void onStatusChanged(final String provider, int status, Bundle extras) {
+            if (status == LocationProvider.TEMPORARILY_UNAVAILABLE || status == LocationProvider.OUT_OF_SERVICE) {
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        locationManager.removeUpdates(InternalLocationListener.this);
+                        locationManager.requestLocationUpdates(provider, period, 0, InternalLocationListener.this);
+                    }
+                }, RETRY_PERIOD);
+            }
+        }
+
+    }
+
+}

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

@@ -0,0 +1,92 @@
+/*
+ * 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.
+ * 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.client;
+
+import java.util.Calendar;
+import java.util.Formatter;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import android.location.Location;
+
+/**
+ * Protocol formatting
+ */
+public class Protocol {
+
+    /**
+     * Format device id message
+     */
+    public static String createLoginMessage(String id) {
+        StringBuilder s = new StringBuilder("$PGID,");
+        Formatter f = new Formatter(s, Locale.ENGLISH);
+
+        s.append(id);
+
+        byte checksum = 0;
+        for (byte b : s.substring(1).getBytes()) {
+            checksum ^= b;
+        }
+        f.format("*%02x\r\n", (int) checksum);
+        f.close();
+
+        return s.toString();
+    }
+
+    /**
+     * Format location message
+     */
+    public static String createLocationMessage(boolean extended, Location l, double battery) {
+        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();
+            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()) {
+            checksum ^= b;
+        }
+        f.format("*%02x\r\n", (int) checksum);
+        f.close();
+
+        return s.toString();
+    }
+}
+

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 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.
+ * 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.client;
+
+public class RequestManager {
+
+    public interface RequestHandler {
+        void onSuccess();
+        void onFailure();
+    }
+
+    public static void sendRequest(String request, RequestHandler handler) {
+
+        handler.onSuccess();
+
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2012 - 2013 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.
+ * 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.client;
+
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Set;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.ArrayAdapter;
+
+public class StatusActivity extends ListActivity {
+
+    private static final int LIMIT = 20;
+
+    private static final LinkedList<String> messages = new LinkedList<String>();
+    private static final Set<ArrayAdapter<String>> adapters = new HashSet<ArrayAdapter<String>>();
+
+    private static void notifyAdapters() {
+        for (ArrayAdapter<String> adapter : adapters) {
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    public static void addMessage(String message) {
+        Log.i(TraccarActivity.LOG_TAG, message);
+        DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT);
+        message = format.format(new Date()) + " - " + message;
+        messages.add(message);
+        while (messages.size() > LIMIT) {
+            messages.removeFirst();
+        }
+        notifyAdapters();
+    }
+
+    public static void clearMessages() {
+        messages.clear();
+        notifyAdapters();
+    }
+
+    private ArrayAdapter<String> adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.status);
+        adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, android.R.id.text1, messages);
+        setListAdapter(adapter);
+        adapters.add(adapter);
+    }
+
+    @Override
+    protected void onDestroy() {
+        adapters.remove(adapter);
+        super.onDestroy();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.status, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.clear) {
+            clearMessages();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+}

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

@@ -0,0 +1,130 @@
+/*
+ * 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.
+ * 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.client;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+import android.telephony.TelephonyManager;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+/**
+ * Main user interface
+ */
+@SuppressWarnings("deprecation")
+public class TraccarActivity extends PreferenceActivity {
+
+    public static final String LOG_TAG = "traccar";
+
+    public static final String KEY_ID = "id";
+    public static final String KEY_ADDRESS = "address";
+    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
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preferences);
+        initPreferences();
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+        if (sharedPreferences.getBoolean(KEY_STATUS, false))
+            startService(new Intent(this, TraccarService.class));
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(
+                preferenceChangeListener);
+    }
+
+    @Override
+    protected void onPause() {
+        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(
+                preferenceChangeListener);
+        super.onPause();
+    }
+
+    OnSharedPreferenceChangeListener preferenceChangeListener = new OnSharedPreferenceChangeListener() {
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+            if (key.equals(KEY_STATUS)) {
+                if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
+                    startService(new Intent(TraccarActivity.this, TraccarService.class));
+                } else {
+                    stopService(new Intent(TraccarActivity.this, TraccarService.class));
+                }
+            } else if (key.equals(KEY_ID)) {
+                findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, null));
+            }
+        }
+    };
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.status) {
+            startActivity(new Intent(this, StatusActivity.class));
+            return true;
+        } else if (item.getItemId() == R.id.about) {
+            startActivity(new Intent(this, AboutActivity.class));
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private boolean isServiceRunning() {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (TraccarService.class.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void initPreferences() {
+        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+
+        TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+        String id = telephonyManager.getDeviceId();
+
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+
+        if (!sharedPreferences.contains(KEY_ID)) {
+            sharedPreferences.edit().putString(KEY_ID, id).commit();
+        }
+        findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, id));
+    }
+
+}

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

@@ -0,0 +1,179 @@
+/*
+ * 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.
+ * 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.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;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+/**
+ * Background service
+ */
+public class TraccarService extends Service {
+
+    public static final String LOG_TAG = "Traccar.TraccarService";
+
+    private String id;
+    private String address;
+    private int port;
+    private int interval;
+    private String provider;
+    private boolean extended;
+
+    private SharedPreferences sharedPreferences;
+    private ClientController clientController;
+    private PositionProvider positionProvider;
+    
+    private WakeLock wakeLock;
+
+    @Override
+    public void onCreate() {
+        StatusActivity.addMessage(getString(R.string.status_service_create));
+
+        PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
+        wakeLock.acquire();
+
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+        try {
+            id = sharedPreferences.getString(TraccarActivity.KEY_ID, null);
+            address = sharedPreferences.getString(TraccarActivity.KEY_ADDRESS, null);
+            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);
+        }
+
+        clientController = new ClientController(this, address, port, Protocol.createLoginMessage(id));
+        clientController.start();
+
+        positionProvider = new PositionProvider(this, provider, interval * 1000, positionListener);
+        positionProvider.startUpdates();
+
+        sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        StatusActivity.addMessage(getString(R.string.status_service_destroy));
+
+        if (sharedPreferences != null) {
+        	sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+        }
+
+        if (positionProvider != null) {
+        	positionProvider.stopUpdates();
+        }
+
+        if (clientController != null) {
+        	clientController.stop();
+        }
+
+        wakeLock.release();
+    }
+
+    @TargetApi(Build.VERSION_CODES.ECLAIR)
+    public double getBatteryLevel() {
+        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.ECLAIR) {
+            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;
+        } else {
+            return 0;
+        }
+    }
+
+    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(extended, location, getBatteryLevel()));
+            }
+        }
+
+    };
+
+    OnSharedPreferenceChangeListener preferenceChangeListener = new OnSharedPreferenceChangeListener() {
+
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+            StatusActivity.addMessage(getString(R.string.status_preference_update));
+            try {
+                if (key.equals(TraccarActivity.KEY_ADDRESS)) {
+
+                    address = sharedPreferences.getString(TraccarActivity.KEY_ADDRESS, null);
+                    clientController.setNewServer(address, port);
+
+                } else if (key.equals(TraccarActivity.KEY_PORT)) {
+
+                    port = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_PORT, null));
+                    clientController.setNewServer(address, port);
+
+                } else if (key.equals(TraccarActivity.KEY_INTERVAL)) {
+
+                    interval = Integer.valueOf(sharedPreferences.getString(TraccarActivity.KEY_INTERVAL, null));
+                    positionProvider.stopUpdates();
+                    positionProvider = new PositionProvider(TraccarService.this, provider, interval * 1000, positionListener);
+                    positionProvider.startUpdates();
+
+                } else if (key.equals(TraccarActivity.KEY_ID)) {
+
+                    id = sharedPreferences.getString(TraccarActivity.KEY_ID, null);
+                    clientController.setNewLogin(Protocol.createLoginMessage(id));
+
+                } else if (key.equals(TraccarActivity.KEY_PROVIDER)) {
+
+                    provider = sharedPreferences.getString(TraccarActivity.KEY_PROVIDER, null);
+                    positionProvider.stopUpdates();
+                    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);
+            }
+        }
+
+    };
+
+}

app/src/main/res/layout/about.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ImageView
+        android:id="@+id/logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="@dimen/about_margin"
+        android:layout_marginStart="@dimen/about_margin"
+        android:layout_marginTop="@dimen/about_margin"
+        android:src="@drawable/ic_launcher"
+        android:contentDescription="@string/app_logo" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_margin="@dimen/about_margin"
+        android:layout_toRightOf="@+id/logo"
+        android:layout_toEndOf="@+id/logo"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/about_spacing"
+            android:text="@string/app_name"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+        
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/about_spacing"
+            android:text="@string/about_description" />
+        
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/about_spacing"
+            android:text="@string/about_license" />
+        
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/about_spacing"
+            android:text="@string/about_web"
+            android:autoLink="web" />
+        
+    </LinearLayout>
+
+</RelativeLayout>

app/src/main/res/layout/status.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" />

app/src/main/res/menu/main.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/status"
+        android:title="@string/menu_status"
+        android:showAsAction="always" />
+
+    <item
+        android:id="@+id/about"
+        android:title="@string/menu_about"
+        android:showAsAction="ifRoom" />
+
+</menu>

app/src/main/res/menu/status.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/clear"
+        android:title="@string/menu_clear"
+        android:showAsAction="always" />
+
+</menu>

app/src/main/res/values-cs/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">Identifikátor zařízení</string>
+    <string name="settings_address_title">Adresa serveru</string>
+    <string name="settings_address_summary">Doménové jméno nebo IP adresa</string>
+    <string name="settings_port_title">Port</string>
+    <string name="settings_port_summary">TCP port sledovacího serveru</string>
+    <string name="settings_interval_title">Frekvence</string>
+    <string name="settings_interval_summary">Interval zpráv v sekundách</string>
+    <string name="settings_status_title">Stav služby</string>
+    <string name="settings_status_off">Start</string>
+    <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">
+        <item>GPS</item>
+        <item>Mobilní síť</item>
+        <item>Obojí</item>
+    </string-array>
+    
+    <string name="menu_status">Stav</string>
+    <string name="menu_about">O aplikaci</string>
+    <string name="menu_clear">Vyčistit</string>
+    
+    <string name="about_description">GPS sledovací aplikace pracující v reálném čase pro zařízení s operačním systémem Android. Kompatibilní s Traccar serverem a dalšími sledovacími systémy.</string>
+    <string name="about_license">Tato aplikace je zdarma a open source, zdrojový kód je licencován pod Apache License Version 2.0 a je přístupný na GitHub.</string>
+    <string name="about_web">Pro více informací navštivte\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Služba vytvořena</string>
+    <string name="status_service_destroy">Služba zastavena</string>
+    <string name="status_connection_success">Spojení se zdařilo</string>
+    <string name="status_connection_fail">Spojení selhalo</string>
+    <string name="status_send_fail">Odesílání selhalo</string>
+    <string name="status_location_update">Aktualizace pozice</string>
+    <string name="status_preference_update">Aktualizace nastavení</string>
+    <string name="status_connectivity_change">Změna připojení</string>
+
+</resources>

app/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_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>
+    <string name="status_connectivity_change">Connectivity forandring</string>
+
+</resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar für Android</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Gerätekennung</string>
+    <string name="settings_address_title">Serveradresse</string>
+    <string name="settings_address_summary">Domain oder IP Adresse</string>
+    <string name="settings_port_title">Serverport</string>
+    <string name="settings_port_summary">Port des Ortungsservers</string>
+    <string name="settings_interval_title">Frequenz</string>
+    <string name="settings_interval_summary">Intervall in Sekunden</string>
+    <string name="settings_status_title">Dienststatus</string>
+    <string name="settings_status_off">Start</string>
+    <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">
+        <item>GPS</item>
+        <item>Netzwerk</item>
+        <item>Gemischt</item>
+    </string-array>
+    
+    <string name="menu_status">Status</string>
+    <string name="menu_about">Über</string>
+    <string name="menu_clear">Leeren</string>
+    
+    <string name="about_description">Echtzeit GPS Ortung für Android Geräte. Kompatibel mit Traccar Server und anderen Ortungsservern.</string>
+    <string name="about_license">Dieses Programm ist frei und Open Source. Es ist unter Apache Lizenz Version 2.0 lizenziert und ist auf GitHub verfügbar.</string>
+    <string name="about_web">Für weitere Informationen besuche uns auf \nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Dienst installiert</string>
+    <string name="status_service_destroy">Dienst zerstört</string>
+    <string name="status_connection_success">Verbindung erfolgreich</string>
+    <string name="status_connection_fail">Verbindung fehlerhaft</string>
+    <string name="status_send_fail">Übertragung fehlerhaft</string>
+    <string name="status_location_update">Positionsupdate</string>
+    <string name="status_preference_update">Prioritätsupdate</string>
+    <string name="status_connectivity_change">Anschlusswechsel</string>
+
+</resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Cliente Traccar</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Identificador de Dispositivo</string>
+    <string name="settings_address_title">Dirección Servidor</string>
+    <string name="settings_address_summary">Dominio o Dirección IP</string>
+    <string name="settings_port_title">Puerto del Servidor</string>
+    <string name="settings_port_summary">Puerto TCP del rastreador</string>
+    <string name="settings_interval_title">Frecuencia de rastreo</string>
+    <string name="settings_interval_summary">Intervalo de los mensajes, en segundos</string>
+    <string name="settings_status_title">Estado del servicio</string>
+    <string name="settings_status_off">Activado</string>
+    <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">
+        <item>Proveedor GPS</item>
+        <item>Proveedor de red</item>
+        <item>Proveedor mixto</item>
+	</string-array>
+
+    <string name="menu_status">Estado</string>
+    <string name="menu_about">Acerca de&#8230;</string>
+    <string name="menu_clear">Limpiar</string>
+    
+    <string name="about_description">Rastreador GPS en tiempo real para dispositivos Android. Compatible con Servidore Traccar y otros sistemas de rastreo.</string>
+    <string name="about_license">Esta aplición es gratuíta y de código abierto. El código fuente está sometido a Licencia Apache Versión 2 y disponible en Github.</string>
+    <string name="about_web">Para más información visite\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Servicio creado</string>
+    <string name="status_service_destroy">Servicio destruído</string>
+    <string name="status_connection_success">Conexión realizada</string>
+    <string name="status_connection_fail">Fallo en la conexión</string>
+    <string name="status_send_fail">Erro en el envío</string>
+    <string name="status_location_update">Posición actualizada</string>
+    <string name="status_preference_update">Preferencias actualizadas</string>
+    <string name="status_connectivity_change">Cambio conectividad</string>
+
+</resources>	 

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Identifiant du périphérique</string>
+    <string name="settings_address_title">Adresse du serveur</string>
+    <string name="settings_address_summary">Nom de domaine ou adresse IP</string>
+    <string name="settings_port_title">Port du serveur</string>
+    <string name="settings_port_summary">Port TCP du serveur</string>
+    <string name="settings_interval_title">Fréquence</string>
+    <string name="settings_interval_summary">Fréquence d\'envoi de la localisation en secondes</string>
+    <string name="settings_status_title">Statut</string>
+    <string name="settings_status_off">Démarrer</string>
+    <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">
+        <item>Mode GPS uniquement</item>
+        <item>Mode cellulaire uniquement</item>
+        <item>Mode hybride</item>
+    </string-array>
+
+    <string name="menu_status">Etat</string>
+    <string name="menu_about">A propos</string>
+    <string name="menu_clear">Effacer</string>
+
+    <string name="about_description">Suivi GPS en temps réels d\'appareils Android. Compatible avec le serveur Traccar ainsi que d\'autres plateformes de suivi.</string>
+    <string name="about_license">Cette application open source est gratuite. Le code source disponible sur GitHub est sous licence Apache Version 2.0.</string>
+    <string name="about_web">Pour plus d’information, visitez le site: \nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Service créé</string>
+    <string name="status_service_destroy">Service supprimé</string>
+    <string name="status_connection_success">Connexion établie avec le serveur</string>
+    <string name="status_connection_fail">Echec de la connexion au serveur</string>
+    <string name="status_send_fail">L’envoi de localisation a échoué</string>
+    <string name="status_location_update">Localisation mise à jour</string>
+    <string name="status_preference_update">Mise à jour des préférences</string>
+    <string name="status_connectivity_change">Changement de connectivité</string>
+
+</resources>

app/src/main/res/values-nb/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">Enhetsidentifikasjon</string>
+    <string name="settings_address_title">Tjeneradresse</string>
+    <string name="settings_address_summary">Domenenavn eller IP-adresse</string>
+    <string name="settings_port_title">Tjenerport</string>
+    <string name="settings_port_summary">TCP-port til sporingstjener</string>
+    <string name="settings_interval_title">Frekvens</string>
+    <string name="settings_interval_summary">Beskjedintervall i sekunder</string>
+    <string name="settings_status_title">Tjeneste-status</string>
+    <string name="settings_status_off">Start</string>
+    <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">
+        <item>GPS-lokalisering</item>
+        <item>Nettverkslokalisering</item>
+        <item>Blandet lokalisering</item>
+    </string-array>
+    
+    <string name="menu_status">Status</string>
+    <string name="menu_about">Om</string>
+    <string name="menu_clear">Tøm</string>
+    
+    <string name="about_description">Sanntids GPS-sporing for Android-enheter. Kompatible med Traccar Server og andre sporingssystemer.</string>
+    <string name="about_license">Dette programmet har fri og åpen kildekode; kildekoden er lisensiert under Apache License Version 2.0 og er tilgjengelig på GitHub.</string>
+    <string name="about_web">For mer informasjon besøk\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Tjeneste opprettet</string>
+    <string name="status_service_destroy">Tjeneste ødelagt</string>
+    <string name="status_connection_success">Tilkobling var vellykket</string>
+    <string name="status_connection_fail">Tilkobling mislyktes</string>
+    <string name="status_send_fail">Sending mislyktes</string>
+    <string name="status_location_update">Plassering oppdatert</string>
+    <string name="status_preference_update">Innstillinger oppdatert</string>
+    <string name="status_connectivity_change">Tilkobling forandret</string>
+
+</resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Cliente Traccar</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Identificador único</string>
+    <string name="settings_address_title">Endereço do servidor</string>
+    <string name="settings_address_summary">Nome do domínio ou endereço IP</string>
+    <string name="settings_port_title">Porta do servidor</string>
+    <string name="settings_port_summary">Porta TCP do servidor de rastreamento</string>
+    <string name="settings_interval_title">Invervalo</string>
+    <string name="settings_interval_summary">Intervalo entre as mensagens em segundos</string>
+    <string name="settings_status_title">Status do Serviço</string>
+    <string name="settings_status_off">Iniciar</string>
+    <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">
+        <item>Provedor GPS</item>
+        <item>Provedor Rede</item>
+        <item>Provedor Misto</item>
+    </string-array>
+    
+    <string name="menu_status">Status</string>
+    <string name="menu_about">Sobre</string>
+    <string name="menu_clear">Limpar</string>
+    
+    <string name="about_description">Rastreador GPS Real Time para dispositivos Android. Compatível com servidor Traccar e outros sistemas de rastreamento.</string>
+    <string name="about_license">Esta aplicação é livre e de código aberto, o código fonte é licenciado sob a licença Apache Versão 2.0 e disponível no GitHub.</string>
+    <string name="about_web">Para mais informações visite\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Serviço criado</string>
+    <string name="status_service_destroy">Serviço destruído</string>
+    <string name="status_connection_success">Sucesso na conexão</string>
+    <string name="status_connection_fail">Falha na conexão</string>
+    <string name="status_send_fail">Falha no envio</string>
+    <string name="status_location_update">Localização atualizada</string>
+    <string name="status_preference_update">Preferências atualizadas</string>
+    <string name="status_connectivity_change">Mudança de conectividade</string>
+
+</resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar Клиент</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Идентификатор устройства</string>
+    <string name="settings_address_title">Адрес сервера</string>
+    <string name="settings_address_summary">Домен или IP адрес</string>
+    <string name="settings_port_title">Порт сервера</string>
+    <string name="settings_port_summary">TCP порт мониторингового сервера</string>
+    <string name="settings_interval_title">Частота</string>
+    <string name="settings_interval_summary">Интервал между сообщениями в секундах</string>
+    <string name="settings_status_title">Состояние сервиса</string>
+    <string name="settings_status_off">Старт</string>
+    <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">
+        <item>GPS провайдер</item>
+        <item>Сетевой провайдер</item>
+        <item>Смешанный провайдер</item>
+    </string-array>
+
+    <string name="menu_status">Состояние</string>
+    <string name="menu_about">О программе</string>
+    <string name="menu_clear">Очистить</string>
+    
+    <string name="about_description">Трекер для Android устройств. Совместим с Traccar сервером и другими мониторинговыми системами.</string>
+    <string name="about_license">Это приложение распростаняется бесплатно, исходный код распростаняется по лицензии Apache License Version 2.0 и доступен на GitHub.</string>
+    <string name="about_web">Для получения дополнительной информации посетите\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Сервис создан</string>
+    <string name="status_service_destroy">Сервис удален</string>
+    <string name="status_connection_success">Соедниение установлено</string>
+    <string name="status_connection_fail">Ошибка установки соединения</string>
+    <string name="status_send_fail">Ошибка отправки</string>
+    <string name="status_location_update">Обновление местоположения</string>
+    <string name="status_preference_update">Обновление настроек</string>
+    <string name="status_connectivity_change">Изменение подключения</string>
+
+</resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar klijent</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Identifikator uređaja</string>
+    <string name="settings_address_title">Adresa servera</string>
+    <string name="settings_address_summary">Domen ime ili IP adresa</string>
+    <string name="settings_port_title">Server port</string>
+    <string name="settings_port_summary">TCP port servera</string>
+    <string name="settings_interval_title">Učestalost</string>
+    <string name="settings_interval_summary">Interval podataka u sekundama</string>
+    <string name="settings_status_title">Status servisa</string>
+    <string name="settings_status_off">Start</string>
+    <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">
+        <item>GPS provajder</item>
+        <item>Provajder Mreže</item>
+        <item>Oba zajedno provajdera</item>
+    </string-array>
+
+    <string name="menu_status">Status</string>
+    <string name="menu_about">O klijentu</string>
+    <string name="menu_clear">Očisti</string>
+
+    <string name="about_description">GPS tracker za Android telefone. GPS satelit kompatibilno.</string>
+    <string name="about_license">Ova aplikacija je besplatna i open source,izvorni kod je licenciran pod Apache License Version 2.0 i dostupan na GitHub</string>
+    <string name="about_web">"Za više informacija www.traccar.org/client "</string>
+
+    <string name="status_service_create">Servis kreiran</string>
+    <string name="status_service_destroy">Servis uništen</string>
+    <string name="status_connection_success">Konekcija uspešna</string>
+    <string name="status_connection_fail">Konekcija neuspešna</string>
+    <string name="status_send_fail">Slanje neuspešno</string>
+    <string name="status_location_update">Ažuriranje lokacije</string>
+    <string name="status_preference_update">Ažuriranje preferenci</string>
+    <string name="status_connectivity_change">Promenjena konekcija</string>
+
+</resources>

app/src/main/res/values-v11/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Holo.Light">
+    </style>
+
+</resources>

app/src/main/res/values-v21/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Material.Light">
+    </style>
+
+</resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="about_margin">20dp</dimen>
+    <dimen name="about_spacing">15dp</dimen>
+</resources>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Traccar Client</string>
+    <string name="app_logo">Traccar</string>
+
+    <string name="settings_id_title">Device identifier</string>
+    <string name="settings_address_title">Server address</string>
+    <string name="settings_address_summary">Domain name or IP address</string>
+    <string name="settings_port_title">Server port</string>
+    <string name="settings_port_summary">Tracking server TCP port</string>
+    <string name="settings_interval_title">Frequency</string>
+    <string name="settings_interval_summary">Messages interval in seconds</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 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">
+        <item>GPS provider</item>
+        <item>Network provider</item>
+        <item>Mixed provider</item>
+    </string-array>
+    
+    <string name="menu_status">Status</string>
+    <string name="menu_about">About</string>
+    <string name="menu_clear">Clear</string>
+    
+    <string name="about_description">Real time GPS tracker for Android devices. Compatible with Traccar Server and other tracking systems.</string>
+    <string name="about_license">This application is free and open source, source code is licensed under Apache License Version 2.0 and available on GitHub.</string>
+    <string name="about_web">For more information visit\nwww.traccar.org/client</string>
+
+    <string name="status_service_create">Service created</string>
+    <string name="status_service_destroy">Service destroyed</string>
+    <string name="status_connection_success">Connection succeeded</string>
+    <string name="status_connection_fail">Connection failed</string>
+    <string name="status_send_fail">Send failed</string>
+    <string name="status_location_update">Location update</string>
+    <string name="status_preference_update">Preference update</string>
+    <string name="status_connectivity_change">Connectivity change</string>
+    <string name="status_provider_missing">Missing location provider</string>
+
+</resources>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TraccarTheme" parent="android:Theme.Light">
+    </style>
+
+</resources>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="settings_provider_values" translatable="false">
+        <item>gps</item>
+        <item>network</item>
+        <item>mixed</item>
+    </string-array>
+
+</resources>

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <EditTextPreference
+        android:key="id"
+        android:title="@string/settings_id_title" />
+
+    <EditTextPreference
+        android:defaultValue="demo.traccar.org"
+        android:key="address"
+        android:summary="@string/settings_address_summary"
+        android:title="@string/settings_address_title" />
+
+    <EditTextPreference
+        android:defaultValue="5005"
+        android:key="port"
+        android:numeric="integer"
+        android:summary="@string/settings_port_summary"
+        android:title="@string/settings_port_title" />
+
+    <EditTextPreference
+        android:defaultValue="60"
+        android:key="interval"
+        android:numeric="integer"
+        android:summary="@string/settings_interval_summary"
+        android:title="@string/settings_interval_title" />
+
+    <ListPreference
+        android:defaultValue="gps"
+        android:entries="@array/settings_provider_names"
+        android:entryValues="@array/settings_provider_values"
+        android:key="provider"
+        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"
+        android:summaryOff="@string/settings_status_off_summary"
+        android:summaryOn="@string/settings_status_on_summary"
+        android:switchTextOff="@string/settings_status_off"
+        android:switchTextOn="@string/settings_status_on"
+        android:title="@string/settings_status_title" />
+
+</PreferenceScreen>

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <EditTextPreference
+        android:key="id"
+        android:title="@string/settings_id_title" />
+
+    <EditTextPreference
+        android:defaultValue="demo.traccar.org"
+        android:key="address"
+        android:summary="@string/settings_address_summary"
+        android:title="@string/settings_address_title" />
+
+    <EditTextPreference
+        android:defaultValue="5005"
+        android:key="port"
+        android:numeric="integer"
+        android:summary="@string/settings_port_summary"
+        android:title="@string/settings_port_title" />
+
+    <EditTextPreference
+        android:defaultValue="60"
+        android:key="interval"
+        android:numeric="integer"
+        android:summary="@string/settings_interval_summary"
+        android:title="@string/settings_interval_title" />
+
+    <ListPreference
+        android:defaultValue="gps"
+        android:entries="@array/settings_provider_names"
+        android:entryValues="@array/settings_provider_values"
+        android:key="provider"
+        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"
+        android:summaryOff="@string/settings_status_off_summary"
+        android:summaryOn="@string/settings_status_on_summary"
+        android:title="@string/settings_status_title" />
+
+</PreferenceScreen>

app/src/test/java/org/traccar/client/RequestManagerTest.java

@@ -0,0 +1,29 @@
+
+package org.traccar.client;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+
+public class RequestManagerTest {
+
+    @Test
+    public void testSendRequest() throws Exception {
+
+        assertNull(null);
+
+        //ApelProtocolDecoder decoder = new ApelProtocolDecoder(new ApelProtocol());
+
+        /*byte[] buf1 = {0x40,0x4E,0x54,0x43,0x01,0x00,0x00,0x00,0x7B,0x00,0x00,0x00,0x13,0x00,0x44,0x34,0x2A,0x3E,0x53,0x3A,0x38,0x36,0x31,0x37,0x38,0x35,0x30,0x30,0x35,0x32,0x30,0x35,0x30,0x37,0x39};
+        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, buf1)));*/
+
+        //0c002900f12a00000f003235303032363533343135313036340f0033353638393530333632373938313101002000000000
+        //5c00380046e6a95136b693277f11b41a00172709f2ff03160002b9bc630007000000000000000000000000000000c31071090000880500000000000000000000
+        //5c00380072e7a95136b693277f11b41a00172709f2ff03160002b9bc630007000000000000000000000000000000c31071090000880500000000000000000000
+
+        //7900040069ea030000000000
+        //8300c20003006aea03005c003800223aab5107a393276617b41a0030d506e3000414010250bf630007000000000000000000000000000000c3107209000089050000000000006bea03005c003800403aab5107a393276617b41a0030d506e3000414010250bf630007000000000000000000000000000000c3107209000089050000000000006cea03005c0038005e3aab5107a393276617b41a0030d506e3000414010250bf630007000000000000000000000000000000c31072090000890500000000000000000000
+
+    }
+
+}