From 339b04569768e38397b3a619f1f1c03e94a0da06 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 21 Dec 2011 17:57:41 -0800
Subject: [PATCH] Fix crash in issue 680.

---
 .../maps/DynamicSpeedTrackPathDescriptor.java | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java b/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
index 10cafb037..a65eef5de 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
@@ -36,6 +36,9 @@ import android.util.Log;
  */
 public class DynamicSpeedTrackPathDescriptor 
   implements TrackPathDescriptor, OnSharedPreferenceChangeListener {
+  
+  private static int DEFAULT_SPEED_MARGIN = 25;
+  
   private int slowSpeed;
   private int normalSpeed;
   private int speedMargin;
@@ -48,15 +51,23 @@ public class DynamicSpeedTrackPathDescriptor
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
 
     if (prefs == null) {
-      speedMargin = 25;
+      speedMargin = DEFAULT_SPEED_MARGIN;
       return;
     }
     prefs.registerOnSharedPreferenceChangeListener(this);
 
-    speedMargin = Integer.parseInt(prefs.getString(
-        context.getString(R.string.track_color_mode_dynamic_speed_variation_key), "25"));
+    speedMargin = getSpeedMargin(prefs);
   }
-  
+
+  private int getSpeedMargin(SharedPreferences sharedPreferences) {
+    String key = context.getString(R.string.track_color_mode_dynamic_speed_variation_key);
+    String percentage = sharedPreferences.getString(key, DEFAULT_SPEED_MARGIN + "");
+    if (percentage.isEmpty()) {
+      return DEFAULT_SPEED_MARGIN;
+    }
+    return Integer.parseInt(percentage);
+  }
+
   /**
    * Get the slow speed calculated based on the % below the average speed.
    * @return The speed limit considered as slow.
@@ -88,15 +99,12 @@ public class DynamicSpeedTrackPathDescriptor
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     	
     if (prefs == null) {
-      speedMargin = 25;
+      speedMargin = DEFAULT_SPEED_MARGIN;
       return;
     }
-        
-    speedMargin = 
-        Integer.parseInt(
-    	    prefs.getString(
-    	        context.getString(R.string.track_color_mode_dynamic_speed_variation_key), "25"));
-    }
+
+    speedMargin = getSpeedMargin(prefs);
+  }
 
   @Override
   public boolean needsRedraw() {