From 2deded2d886950aac62e9f28441e5374696c923b Mon Sep 17 00:00:00 2001
From: Josh Kasten <jkasten@gmail.com>
Date: Tue, 27 Sep 2011 22:49:53 -0500
Subject: [PATCH] Renamed omit_illegal_state to
 android.intent.extra.IGNORE_ILLEGAL_STATE Code comment and code style change.

---
 MyTracks/res/values/do_not_translate.xml                   | 2 +-
 .../apps/mytracks/services/TrackRecordingService.java      | 7 +++----
 .../android/apps/mytracks/widgets/TrackWidgetProvider.java | 6 +++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index f3f792b46..cb00bb80a 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -50,5 +50,5 @@ limitations under the License.
   <!-- Intent actions -->
   <string name="save_intent_action">android.intent.action.SAVE</string>
   <string name="open_settings_screen">android.intent.action.settings.OPEN</string>
-  <string name="omit_illegal_state">android.intent.state.illegal.omit</string>
+  <string name="ignore_illegal_state">android.intent.extra.IGNORE_ILLEGAL_STATE</string>
 </resources>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 5b15c8647..d250f194b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -300,10 +300,9 @@ public class TrackRecordingService extends Service {
           } else if (getString(R.string.end_current_track_action).equals(action)) {
             endCurrentTrack();
           }
-        }
-        catch (IllegalStateException e) {
-          if (!intent.getBooleanExtra(getString(R.string.omit_illegal_state), false))
-             throw e;
+        } catch (IllegalStateException e) {
+           if (!intent.getBooleanExtra(getString(R.string.ignore_illegal_state), false))
+              throw e;
         }
       }
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index b772ea201..614f7a7e7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -198,7 +198,11 @@ public class TrackWidgetProvider
   private void setButtonIntent(
       RemoteViews views, Context context, int action, int icon, int extra) {
     Intent intent = new Intent(context, TrackRecordingService.class);
-    intent.putExtra(context.getString(R.string.omit_illegal_state), true);
+    
+    /* Keeps the TrackRecordingService from throwing back an exception in cases where
+     * two of the same intents are sent from the user double taping on the widget. */
+    intent.putExtra(context.getString(R.string.ignore_illegal_state), true);
+
     intent.setAction(context.getString(action));
     if (extra != -1) {
       intent.putExtra(context.getString(extra), true);