Merge heads

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

@@ -37,6 +37,7 @@ import com.google.common.annotations.VisibleForTesting;
 import android.location.Location;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -172,7 +173,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
       tripStatisticsUpdater = startTime != -1L ? new TripStatisticsUpdater(startTime) : null;
       pendingPoints.clear();
       chartView.reset();
-      getActivity().runOnUiThread(new Runnable() {
+      runOnUiThread(new Runnable() {
           @Override
         public void run() {
           if (isResumed()) {
@@ -211,7 +212,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     if (isResumed()) {
       chartView.addDataPoints(pendingPoints);
       pendingPoints.clear();
-      getActivity().runOnUiThread(updateChart);
+      runOnUiThread(updateChart);
     }
   }
 
@@ -232,7 +233,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   @Override
   public void onNewWaypointsDone() {
     if (isResumed()) {
-      getActivity().runOnUiThread(updateChart);
+      runOnUiThread(updateChart);
     }
   }
 
@@ -244,7 +245,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
       }
       metricUnits = metric;
       chartView.setMetricUnits(metricUnits);
-      getActivity().runOnUiThread(new Runnable() {
+      runOnUiThread(new Runnable() {
           @Override
         public void run() {
           if (isResumed()) {
@@ -269,7 +270,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
           getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT);
       setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed);
       setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed);
-      getActivity().runOnUiThread(new Runnable() {
+      runOnUiThread(new Runnable() {
           @Override
         public void run() {
           if (isResumed()) {
@@ -414,6 +415,18 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
   }
 
+  /**
+   * Runs a runnable on the UI thread if possible.
+   * 
+   * @param runnable the runnable
+   */
+  private void runOnUiThread(Runnable runnable) {
+    FragmentActivity fragmentActivity = getActivity();
+    if (fragmentActivity != null) {
+      fragmentActivity.runOnUiThread(runnable);
+    }
+  }
+
   /**
    * Given a location, fill in a data point, an array of double[]. <br>
    * data[0] = time/distance <br>

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

@@ -98,7 +98,14 @@ public class CheckPermissionFragment extends Fragment {
           SendToGoogleUtils.getGoogleAccountCredential(getActivity(), accountName, scope);
           finish(scope, true, null);
         } catch (UserRecoverableAuthException e) {
-          finish(scope, false, e.getIntent());
+          Intent intent = null;
+          try {
+            // HACK: UserRecoverableAuthException.getIntent can throw a null pointer exception. 
+            intent = e.getIntent();
+          } catch (Exception e1) {
+            Log.e(TAG, "Exception in getIntent", e1);
+          }
+          finish(scope, false, intent);
         } catch (GoogleAuthException e) {
           Log.e(TAG, "GoogleAuthException", e);
           finish(scope, false, null);

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

@@ -28,7 +28,6 @@ import com.google.android.apps.mytracks.util.StatsUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -66,7 +65,6 @@ public class MarkerDetailFragment extends Fragment {
 
   private MyTracksProviderUtils myTracksProviderUtils;
   private Waypoint waypoint;
-  private Bitmap bitmap;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -97,13 +95,6 @@ public class MarkerDetailFragment extends Fragment {
     update();
   }
 
-  public void onPause() {
-    super.onPause();
-    if (bitmap != null) {
-      bitmap.recycle();
-    }
-  }
-
   @Override
   public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     inflater.inflate(R.menu.marker_detail, menu);
@@ -180,8 +171,7 @@ public class MarkerDetailFragment extends Fragment {
         int displayWidth = defaultDisplay.getWidth();
         @SuppressWarnings("deprecation")
         int displayHeight = defaultDisplay.getHeight();
-        bitmap = PhotoUtils.setImageVew(
-            imageView, Uri.parse(photoUrl), displayWidth, displayHeight);
+        PhotoUtils.setImageVew(imageView, Uri.parse(photoUrl), displayWidth, displayHeight);
       }
 
       TextView name = (TextView) getView().findViewById(R.id.marker_detail_waypoint_name);