From 73c97f80cd1d99e770507a505be97913879be127 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 4 Aug 2012 17:46:09 +0400
Subject: [PATCH] Add device identifier

---
 AndroidManifest.xml                         |  4 ++--
 res/layout/main.xml                         | 17 +++++++++++++++++
 src/org/traccar/client/TraccarActivity.java | 14 ++++++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c20065e..09efaaa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.traccar.client"
-      android:versionCode="2"
-      android:versionName="1.1">
+      android:versionCode="4"
+      android:versionName="1.3">
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity android:name="TraccarActivity"
                   android:label="@string/app_name"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 8df7a59..e327941 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -54,6 +54,23 @@
     android:layout_width="fill_parent"
     android:layout_height="10sp"
     />
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="Device identifier"
+    />
+<EditText
+    android:id="@+id/edit_device"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:inputType="none"
+    android:editable="false"
+    android:focusable="false"
+    />
+<View
+    android:layout_width="fill_parent"
+    android:layout_height="10sp"
+    />
 <TextView
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
diff --git a/src/org/traccar/client/TraccarActivity.java b/src/org/traccar/client/TraccarActivity.java
index 1ff223d..e1a4ff0 100644
--- a/src/org/traccar/client/TraccarActivity.java
+++ b/src/org/traccar/client/TraccarActivity.java
@@ -24,6 +24,7 @@ import android.text.method.*;
 import android.text.util.*;
 import android.view.*;
 import android.widget.*;
+import android.telephony.TelephonyManager;
 
 /**
  * Global parameters
@@ -63,6 +64,7 @@ public class TraccarActivity extends Activity {
 	private EditText editAddress;
     private EditText editPort;
     private EditText editPeriod;
+    private EditText editDevice;
     private EditText editService;
     private EditText editConnection;
     private ToggleButton button;
@@ -84,16 +86,24 @@ public class TraccarActivity extends Activity {
         setContentView(R.layout.main);
 
         // DO SOMETHING WITH IT
-        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
-        StrictMode.setThreadPolicy(policy);
+        try {
+        	StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+        	StrictMode.setThreadPolicy(policy);
+        } catch(Throwable e) {
+        }
 
         // Bind elements
         editAddress = (EditText) findViewById(R.id.edit_address);
         editPort = (EditText) findViewById(R.id.edit_port);
         editPeriod = (EditText) findViewById(R.id.edit_period);
+        editDevice = (EditText) findViewById(R.id.edit_device);
         editService = (EditText) findViewById(R.id.edit_service);
         editConnection = (EditText) findViewById(R.id.edit_connection);
         button = (ToggleButton) findViewById(R.id.button);
+        
+        // Set device identifier
+        TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+        editDevice.setText(telephonyManager.getDeviceId());
 
         editService.setText(Traccar.STATUS_STOPPED);
         editConnection.setText(Traccar.STATUS_DISCONNECTED);