From dd4054c4fc5b612a0777103458b391389296f452 Mon Sep 17 00:00:00 2001
From: Sandor Dornbush <Sandor Dornbush@localhost>
Date: Mon, 11 Jul 2011 22:50:06 -0700
Subject: [PATCH] Address comments.

---
 .../mytracks/widgets/TrackWidgetProvider.java | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

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 56f1ace79..6177e99a9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -68,9 +68,9 @@ public class TrackWidgetProvider
   private MyTracksProviderUtils providerUtils;
   private Context context;
   private String unknown;
-  private String distance;
-  private String speed;
-  private String pace;
+  private String distanceLabel;
+  private String speedLabel;
+  private String paceLabel;
   private TrackObserver trackObserver;
   private boolean isMetric;
   private boolean reportSpeed;
@@ -86,6 +86,9 @@ public class TrackWidgetProvider
   }
 
   private void initialize(Context context) {
+    if (this.context != null) {
+      return;
+    }
     this.context = context;
     trackObserver = new TrackObserver();
     providerUtils = MyTracksProviderUtils.Factory.get(context);
@@ -228,7 +231,8 @@ public class TrackWidgetProvider
     if (!isMetric) {
       displayDistance *= UnitConversions.KM_TO_MI;
     }
-    String distance = StringUtils.formatSingleDecimalPlace(displayDistance) + " " + this.distance;
+    String distance =
+        StringUtils.formatSingleDecimalPlace(displayDistance) + " " + this.distanceLabel;
 
     // convert ms to minutes
     String time = StringUtils.formatTime(stats.getMovingTime());
@@ -240,10 +244,10 @@ public class TrackWidgetProvider
         displaySpeed *= UnitConversions.KMH_TO_MPH;
       }
       if (reportSpeed) {
-        speed = StringUtils.formatSingleDecimalPlace(displaySpeed) + " " + this.speed;
+        speed = StringUtils.formatSingleDecimalPlace(displaySpeed) + " " + this.speedLabel;
       } else {
         long displayPace = (long) (3600000.0 / displaySpeed);
-        speed = StringUtils.formatTime(displayPace) + " " + pace;
+        speed = StringUtils.formatTime(displayPace) + " " + paceLabel;
       }
     }
 
@@ -257,9 +261,9 @@ public class TrackWidgetProvider
     String metricUnitsKey = context.getString(R.string.metric_units_key);
     if (key == null || key.equals(metricUnitsKey)) {
       isMetric = prefs.getBoolean(metricUnitsKey, true);
-      distance = context.getString(isMetric ? R.string.kilometer : R.string.mile);
-      speed = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour);
-      pace = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile);
+      distanceLabel = context.getString(isMetric ? R.string.kilometer : R.string.mile);
+      speedLabel = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour);
+      paceLabel = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile);
     }
 
     String reportSpeedKey = context.getString(R.string.report_speed_key);