In ChartFragment, MapFragment, StatsFragment, for callbacks from

TrackDataHub, check that the fragment is resumed.
In any runnable executed on the UI thread, also check
that the fragment is resumed.

MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java

@@ -83,7 +83,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   private final Runnable updateChart = new Runnable() {
       @Override
     public void run() {
-      if (trackDataHub == null) {
+      if (!isResumed() || trackDataHub == null) {
         return;
       }
 
@@ -178,70 +178,88 @@ public class ChartFragment extends Fragment implements TrackDataListener {
 
   @Override
   public void onTrackUpdated(Track track) {
+    if (isResumed()) {
       if (track == null || track.getTripStatistics() == null) {
         startTime = -1L;
         return;
       }
       startTime = track.getTripStatistics().getStartTime();
     }
+  }
 
   @Override
   public void clearTrackPoints() {
+    if (isResumed()) {
       tripStatisticsBuilder = startTime != -1L ? new TripStatisticsBuilder(startTime) : null;
       pendingPoints.clear();
       chartView.reset();
-
       getActivity().runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             chartView.resetScroll();
           }
+        }
       });
     }
+  }
 
   @Override
   public void onSampledInTrackPoint(Location location) {
+    if (isResumed()) {
       double[] data = new double[ChartView.NUM_SERIES + 1];
       fillDataPoint(location, data);
       pendingPoints.add(data);
     }
+  }
 
   @Override
   public void onSampledOutTrackPoint(Location location) {
+    if (isResumed()) {
       fillDataPoint(location, null);
     }
+  }
 
   @Override
   public void onSegmentSplit(Location location) {
+    if (isResumed()) {
       fillDataPoint(location, null);
     }
+  }
 
   @Override
   public void onNewTrackPointsDone() {
+    if (isResumed()) {
       chartView.addDataPoints(pendingPoints);
       pendingPoints.clear();
       getActivity().runOnUiThread(updateChart);
     }
+  }
 
   @Override
   public void clearWaypoints() {
+    if (isResumed()) {
       chartView.clearWaypoints();
     }
+  }
 
   @Override
   public void onNewWaypoint(Waypoint waypoint) {
-    if (waypoint != null && LocationUtils.isValidLocation(waypoint.getLocation())) {
+    if (isResumed() && waypoint != null && LocationUtils.isValidLocation(waypoint.getLocation())) {
       chartView.addWaypoint(waypoint);
     }
   }
 
   @Override
   public void onNewWaypointsDone() {
+    if (isResumed()) {
       getActivity().runOnUiThread(updateChart);
     }
+  }
 
   @Override
   public boolean onMetricUnitsChanged(boolean metric) {
+    if (isResumed()) {
       if (metricUnits == metric) {
         return false;
       }
@@ -250,14 +268,19 @@ public class ChartFragment extends Fragment implements TrackDataListener {
       getActivity().runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             chartView.requestLayout();
           }
+        }
       });
       return true;
     }
+    return false;
+  }
 
   @Override
   public boolean onReportSpeedChanged(boolean speed) {
+    if (isResumed()) {
       if (reportSpeed == speed) {
         return false;
       }
@@ -270,20 +293,27 @@ public class ChartFragment extends Fragment implements TrackDataListener {
       getActivity().runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             chartView.requestLayout();
           }
+        }
       });
       return true;
     }
+    return false;
+  }
 
   @Override
   public boolean onMinRecordingDistanceChanged(int value) {
+    if (isResumed()) {
       if (minRecordingDistance == value) {
         return false;
       }
       minRecordingDistance = value;
       return true;
     }
+    return false;
+  }
 
   /**
    * Checks the chart settings.

MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java

@@ -275,6 +275,7 @@ public class MapFragment extends Fragment
 
   @Override
   public void onLocationStateChanged(LocationState state) {
+    if (isResumed()) {
       final String message;
       final boolean isGpsDisabled;
       if (!isSelectedTrackRecording()) {
@@ -308,10 +309,13 @@ public class MapFragment extends Fragment
       getActivity().runOnUiThread(new Runnable() {
           @Override
         public void run() {
-        if (message != null) {
+          if (isResumed()) {
+            if (message == null) {
+              messageTextView.setVisibility(View.GONE);
+              return;
+            }
             messageTextView.setText(message);
             messageTextView.setVisibility(View.VISIBLE);
-
             if (isGpsDisabled) {
               Toast.makeText(getActivity(), R.string.gps_not_found, Toast.LENGTH_LONG).show();
 
@@ -320,39 +324,44 @@ public class MapFragment extends Fragment
             } else {
               messageTextView.setOnClickListener(null);
             }
-        } else {
-          messageTextView.setVisibility(View.GONE);
           }
         }
       });
     }
+  }
 
   @Override
   public void onLocationChanged(Location location) {
+    if (isResumed()) {
       currentLocation = location;
       updateCurrentLocation();
     }
+  }
 
   @Override
   public void onHeadingChanged(double heading) {
+    if (isResumed()) {
       if (mapOverlay.setHeading((float) heading)) {
         mapView.postInvalidate();
       }
     }
+  }
 
   @Override
   public void onSelectedTrackChanged(final Track track) {
+    if (isResumed()) {
       getActivity().runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             boolean hasTrack = track != null;
             mapOverlay.setTrackDrawingEnabled(hasTrack);
 
             if (hasTrack) {
               synchronized (this) {
                 /*
-             * Synchronize to prevent race condition in changing markerTrackId
+                 * Synchronize to prevent race condition in changing
-             * and markerId variables.
+                 * markerTrackId and markerId variables.
                  */
                 currentSelectedTrackId = track.getId();
                 updateMap(track);
@@ -361,8 +370,10 @@ public class MapFragment extends Fragment
             }
             mapView.invalidate();
           }
+        }
       });
     }
+  }
 
   @Override
   public void onTrackUpdated(Track track) {
@@ -371,13 +382,17 @@ public class MapFragment extends Fragment
 
   @Override
   public void clearTrackPoints() {
+    if (isResumed()) {
       mapOverlay.clearPoints();
     }
+  }
 
   @Override
   public void onSampledInTrackPoint(Location location) {
+    if (isResumed()) {
       mapOverlay.addLocation(location);
     }
+  }
 
   @Override
   public void onSampledOutTrackPoint(Location location) {
@@ -386,22 +401,28 @@ public class MapFragment extends Fragment
 
   @Override
   public void onSegmentSplit(Location location) {
+    if (isResumed()) {
       mapOverlay.addSegmentSplit();
     }
+  }
 
   @Override
   public void onNewTrackPointsDone() {
+    if (isResumed()) {
       mapView.postInvalidate();
     }
+  }
 
   @Override
   public void clearWaypoints() {
+    if (isResumed()) {
       mapOverlay.clearWaypoints();
     }
+  }
 
   @Override
   public void onNewWaypoint(Waypoint waypoint) {
-    if (waypoint != null && LocationUtils.isValidLocation(waypoint.getLocation())) {
+    if (isResumed() && waypoint != null && LocationUtils.isValidLocation(waypoint.getLocation())) {
       // TODO: Optimize locking inside addWaypoint
       mapOverlay.addWaypoint(waypoint);
     }
@@ -409,8 +430,10 @@ public class MapFragment extends Fragment
 
   @Override
   public void onNewWaypointsDone() {
+    if (isResumed()) {
       mapView.postInvalidate();
     }
+  }
 
   @Override
   public boolean onMetricUnitsChanged(boolean metric) {

MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java

@@ -58,10 +58,9 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   // A runnable to update the total time field.
   private final Runnable updateTotalTime = new Runnable() {
     public void run() {
-      FragmentActivity activity = getActivity();
+      if (isResumed() && isSelectedTrackRecording() && !isSelectedTrackPaused()
-      if (activity != null && lastTripStatistics != null && isSelectedTrackRecording()
+          && lastTripStatistics != null) {
-          && !isSelectedTrackPaused()) {
+        StatsUtils.setTotalTimeValue(getActivity(), System.currentTimeMillis()
-        StatsUtils.setTotalTimeValue(activity, System.currentTimeMillis()
             - lastTripStatistics.getStopTime() + lastTripStatistics.getTotalTime());
       }
     }
@@ -74,11 +73,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     @Override
     public void run() {
       Log.d(TAG, "UI update thread started");
-      while (isSelectedTrackRecording()) {
+      while (isResumed() && isSelectedTrackRecording()) {
-        FragmentActivity activity = getActivity();
+        getActivity().runOnUiThread(updateTotalTime);
-        if (activity != null) {
-          activity.runOnUiThread(updateTotalTime);
-        }
         try {
           Thread.sleep(1000L);
         } catch (InterruptedException e) {
@@ -121,12 +117,13 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   @Override
   public void onLocationStateChanged(LocationState state) {
     if (isResumed() && state != LocationState.GOOD_FIX) {
-      final FragmentActivity activity = getActivity();
+      getActivity().runOnUiThread(new Runnable() {
-      activity.runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             lastLocation = null;
-          StatsUtils.setLocationValues(activity, lastLocation, true);
+            StatsUtils.setLocationValues(getActivity(), lastLocation, true);
+          }
         }
       });
     }
@@ -135,17 +132,18 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   @Override
   public void onLocationChanged(final Location location) {
     if (isResumed()) {
-      final FragmentActivity activity = getActivity();
+      getActivity().runOnUiThread(new Runnable() {
-      activity.runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             if (isSelectedTrackRecording() && !isSelectedTrackPaused()) {
               lastLocation = location;
-            StatsUtils.setLocationValues(activity, location, true);
+              StatsUtils.setLocationValues(getActivity(), location, true);
             } else {
               if (lastLocation != null) {
                 lastLocation = null;
-              StatsUtils.setLocationValues(activity, lastLocation, true);
+                StatsUtils.setLocationValues(getActivity(), lastLocation, true);
+              }
             }
           }
         }
@@ -175,12 +173,13 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   @Override
   public void onTrackUpdated(final Track track) {
     if (isResumed()) {
-      final FragmentActivity activity = getActivity();
+      getActivity().runOnUiThread(new Runnable() {
-      activity.runOnUiThread(new Runnable() {
           @Override
         public void run() {
+          if (isResumed()) {
             lastTripStatistics = track != null ? track.getTripStatistics() : null;
-          updateUi(activity);
+            updateUi(getActivity());
+          }
         }
       });
     }
@@ -229,11 +228,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   @Override
   public boolean onMetricUnitsChanged(final boolean metric) {
     if (isResumed()) {
-      final FragmentActivity activity = getActivity();
+      getActivity().runOnUiThread(new Runnable() {
-      activity.runOnUiThread(new Runnable() {
           @Override
         public void run() {
-          updateUi(activity);
+          if (isResumed()) {
+            updateUi(getActivity());
+          }
         }
       });
     }
@@ -243,11 +243,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   @Override
   public boolean onReportSpeedChanged(final boolean speed) {
     if (isResumed()) {
-      final FragmentActivity activity = getActivity();
+      getActivity().runOnUiThread(new Runnable() {
-      activity.runOnUiThread(new Runnable() {
           @Override
         public void run() {
-          updateUi(activity);
+          if (isResumed()) {
+            updateUi(getActivity());
+          }
         }
       });
     }