From 052320f98155d36a035f8f1555d0a564500521ee Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 3 Sep 2015 23:04:02 +1200
Subject: [PATCH] Always generate device identifier

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../java/org/traccar/client/MainActivity.java | 34 +++++--------------
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 690b06d..b3b5d46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <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" />
 
diff --git a/app/src/main/java/org/traccar/client/MainActivity.java b/app/src/main/java/org/traccar/client/MainActivity.java
index afe5344..b086bcb 100644
--- a/app/src/main/java/org/traccar/client/MainActivity.java
+++ b/app/src/main/java/org/traccar/client/MainActivity.java
@@ -52,7 +52,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     public static final String KEY_PROVIDER = "provider";
     public static final String KEY_STATUS = "status";
 
-    private static final int PERMISSIONS_REQUEST_DEVICE = 1;
     private static final int PERMISSIONS_REQUEST_LOCATION = 2;
 
     private SharedPreferences sharedPreferences;
@@ -100,16 +99,6 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
     protected void onResume() {
         super.onResume();
         sharedPreferences.registerOnSharedPreferenceChangeListener(this);
-
-        if (!sharedPreferences.contains(KEY_DEVICE)) {
-            if (hasPermission(Manifest.permission.READ_PHONE_STATE)) {
-                initDeviceId(true);
-            } else {
-                requestPermissions(new String[] { Manifest.permission.READ_PHONE_STATE }, PERMISSIONS_REQUEST_DEVICE);
-            }
-        } else {
-            findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, null));
-        }
     }
 
     @Override
@@ -160,19 +149,13 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
 
     private void initPreferences() {
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
-    }
 
-    private void initDeviceId(boolean permission) {
-        String id;
-        if (permission) {
-            id = ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
-        } else {
-            id = String.valueOf(new Random().nextInt(900000) + 100000);
+        if (!sharedPreferences.contains(KEY_DEVICE)) {
+            String id = String.valueOf(new Random().nextInt(900000) + 100000);
+            sharedPreferences.edit().putString(KEY_DEVICE, id).commit();
+            ((EditTextPreference) findPreference(KEY_DEVICE)).setText(id);
         }
-        sharedPreferences.edit().putString(KEY_DEVICE, id).commit();
-        EditTextPreference preference = (EditTextPreference) findPreference(KEY_DEVICE);
-        preference.setText(id);
-        preference.setSummary(id);
+        findPreference(KEY_DEVICE).setSummary(sharedPreferences.getString(KEY_DEVICE, null));
     }
 
     private void startTrackingService(boolean checkPermission, boolean permission) {
@@ -214,10 +197,9 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        if (requestCode == PERMISSIONS_REQUEST_DEVICE) {
-            initDeviceId(grantResults[0] == PackageManager.PERMISSION_GRANTED);
-        } else if (requestCode == PERMISSIONS_REQUEST_LOCATION) {
-            startTrackingService(false, grantResults[0] == PackageManager.PERMISSION_GRANTED && (permissions.length < 2 || grantResults[1] == PackageManager.PERMISSION_GRANTED));
+        if (requestCode == PERMISSIONS_REQUEST_LOCATION) {
+            startTrackingService(false, grantResults[0] == PackageManager.PERMISSION_GRANTED &&
+                    (permissions.length < 2 || grantResults[1] == PackageManager.PERMISSION_GRANTED));
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88e0020..060453b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,6 +41,6 @@
     <string name="status_connectivity_change">Connectivity change</string>
 
     <string name="hidden_app_name">Device Settings</string>
-    <string name="hidden_alert">The app has been hidden from the phone launcher. To open it again please dial 8722227 (TRACCAR).</string>
+    <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
 
 </resources>