From 27a6b7a3ccc7b0e499188cb6e5f7361c94a5bb78 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 19 Mar 2013 22:24:56 +1300
Subject: [PATCH] Make IMEI editable (fix #22)

---
 res/xml-v14/preferences.xml                 |  3 +--
 res/xml/preferences.xml                     |  3 +--
 src/org/traccar/client/TraccarActivity.java | 11 +++++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/res/xml-v14/preferences.xml b/res/xml-v14/preferences.xml
index 2968ec2..5163775 100644
--- a/res/xml-v14/preferences.xml
+++ b/res/xml-v14/preferences.xml
@@ -3,8 +3,7 @@
 
 	<EditTextPreference
         android:key="id"
-        android:title="@string/settings_id_title"
-        android:enabled="false" />
+        android:title="@string/settings_id_title" />
     
 	<EditTextPreference
         android:key="address"
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 99d7767..366aaf2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -3,8 +3,7 @@
 
 	<EditTextPreference
         android:key="id"
-        android:title="@string/settings_id_title"
-        android:enabled="false" />
+        android:title="@string/settings_id_title" />
     
 	<EditTextPreference
         android:key="address"
diff --git a/src/org/traccar/client/TraccarActivity.java b/src/org/traccar/client/TraccarActivity.java
index 5246092..f8dd33a 100644
--- a/src/org/traccar/client/TraccarActivity.java
+++ b/src/org/traccar/client/TraccarActivity.java
@@ -35,7 +35,7 @@ import android.view.MenuItem;
 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";
@@ -74,6 +74,8 @@ public class TraccarActivity extends PreferenceActivity {
                 } else {
                     stopService(new Intent(TraccarActivity.this, TraccarService.class));
                 }
+            } else if (key.equals(KEY_ID)) {
+                findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, null));
             }
         }
     };
@@ -108,14 +110,15 @@ public class TraccarActivity extends PreferenceActivity {
     }
 
     private void initPreferences() {
-
         TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         String id = telephonyManager.getDeviceId();
 
         SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
 
-        sharedPreferences.edit().putString(KEY_ID, id).commit();
-        findPreference(KEY_ID).setSummary(id);
+        if (!sharedPreferences.contains(KEY_ID)) {
+            sharedPreferences.edit().putString(KEY_ID, id).commit();
+        }
+        findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, id));
 
         sharedPreferences.edit().putBoolean(KEY_STATUS, isServiceRunning()).commit();
     }