Merge heads

MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java

@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.util.TrackNameUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.os.Bundle;
@@ -95,6 +96,11 @@ public class TrackEditActivity extends AbstractMyTracksActivity {
 
     Button cancel = (Button) findViewById(R.id.track_edit_cancel);
     if (getIntent().getBooleanExtra(EXTRA_NEW_TRACK, false)) {
+      String trackName = TrackNameUtils.getTrackName(
+          this, -1L, -1L, myTracksProviderUtils.getLastLocation());
+      if (trackName != null) {
+        name.setText(trackName);
+      }
       setTitle(R.string.track_edit_new_track_title);
       cancel.setVisibility(View.GONE);
     } else {

MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java

@@ -1,73 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.android.apps.mytracks.services;
-
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.maps.mytracks.R;
-import com.google.common.annotations.VisibleForTesting;
-
-import android.content.Context;
-
-import java.text.SimpleDateFormat;
-
-/**
- * Creates a default track name based on the track name setting.
- *
- * @author Matthew Simmons
- */
-public class DefaultTrackNameFactory {
-
-  @VisibleForTesting
-  static final String ISO_8601_FORMAT = "yyyy-MM-dd HH:mm";
-  private final Context context;
-
-  public DefaultTrackNameFactory(Context context) {
-    this.context = context;
-  }
-
-  /**
-   * Gets the default track name.
-   *
-   * @param trackId the track id
-   * @param startTime the track start time
-   */
-  public String getDefaultTrackName(long trackId, long startTime) {
-    String trackNameSetting = getTrackNameSetting();
-
-    if (trackNameSetting.equals(
-        context.getString(R.string.settings_recording_track_name_date_local_value))) {
-      return StringUtils.formatDateTime(context, startTime);
-    } else if (trackNameSetting.equals(
-        context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) {
-      SimpleDateFormat dateFormat = new SimpleDateFormat(ISO_8601_FORMAT);
-      return dateFormat.format(startTime);
-    } else {
-      // trackNameSetting equals
-      // R.string.settings_recording_track_name_number_value
-      return context.getString(R.string.track_name_format, trackId);
-    }
-  }
-
-  /**
-   * Gets the track name setting.
-   */
-  @VisibleForTesting
-  String getTrackNameSetting() {
-    return PreferencesUtils.getString(context, R.string.track_name_key,
-        context.getString(R.string.settings_recording_track_name_date_local_value));
-  }
-}

MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java

@@ -42,6 +42,7 @@ import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
 import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
+import com.google.android.apps.mytracks.util.TrackNameUtils;
 import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
@@ -584,8 +585,7 @@ public class TrackRecordingService extends Service {
     Uri trackUri = providerUtils.insertTrack(track);
     recordingTrackId = Long.parseLong(trackUri.getLastPathSegment());
     track.setId(recordingTrackId);
-    track.setName(new DefaultTrackNameFactory(this).getDefaultTrackName(
-        recordingTrackId, startTime));
+    track.setName(TrackNameUtils.getTrackName(this, recordingTrackId, startTime, null));
     track.setCategory(PreferencesUtils.getString(
         this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT));
     isRecording = true;

MyTracks/src/com/google/android/apps/mytracks/util/TrackNameUtils.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.android.apps.mytracks.util;
+
+import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
+
+import android.content.Context;
+import android.location.Address;
+import android.location.Geocoder;
+import android.location.Location;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ * Utilities for track name.
+ *
+ * @author Matthew Simmons
+ */
+public class TrackNameUtils {
+
+  @VisibleForTesting
+  static final String ISO_8601_FORMAT = "yyyy-MM-dd HH:mm";
+
+  private TrackNameUtils() {
+  }
+
+  /**
+   * Gets the track name.
+   *
+   * @param context the context
+   * @param trackId the track id
+   * @param startTime the track start time
+   * @param location the track location
+   */
+  public static String getTrackName(
+      Context context, long trackId, long startTime, Location location) {
+    String trackName = PreferencesUtils.getString(context, R.string.track_name_key,
+        context.getString(R.string.settings_recording_track_name_location_value));
+
+    if (trackName.equals(
+        context.getString(R.string.settings_recording_track_name_date_local_value))) {
+      if (startTime == -1L) {
+        return null;
+      }
+      return StringUtils.formatDateTime(context, startTime);
+    } else if (trackName.equals(
+        context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) {
+      if (startTime == -1L) {
+        return null;
+       }
+      SimpleDateFormat dateFormat = new SimpleDateFormat(ISO_8601_FORMAT);
+      return dateFormat.format(startTime);
+    } else if (trackName.equals(
+        context.getString(R.string.settings_recording_track_name_number_value))) {
+      if (trackId == -1L) {
+        return null;
+      }
+      return context.getString(R.string.track_name_format, trackId);
+    } else {
+      // trackName equals settings_recording_track_name_location_value or any
+      // value
+      if (location != null) {
+        return getReverseGeoCoding(context, location);
+      } else {
+        // assume startTime != -1L when location == null
+        return StringUtils.formatDateTime(context, startTime);
+      }
+    }
+  }
+
+  /**
+   * Gets the reverse geo coding string for a location.
+   * 
+   * @param context the context
+   * @param location the location
+   */
+  private static String getReverseGeoCoding(Context context, Location location) {
+    if (location == null || !Geocoder.isPresent()) {
+      return null;
+    }
+    Geocoder geocoder = new Geocoder(context);
+    try {
+      List<Address> addresses = geocoder.getFromLocation(
+          location.getLatitude(), location.getLongitude(), 1);
+      if (addresses.size() > 0) {
+        Address address = addresses.get(0);
+        int lines = address.getMaxAddressLineIndex();
+        if (lines > 0) {
+          return address.getAddressLine(0);
+        }
+        String featureName = address.getFeatureName();
+        if (featureName != null) {
+          return featureName;
+        }
+        String thoroughfare = address.getThoroughfare();
+        if (thoroughfare != null) {
+          return thoroughfare;
+        }
+        String locality = address.getLocality();
+        if (locality != null) {
+          return locality;
+        }
+      }
+    } catch (IOException e) {
+      // Can safely ignore
+    }
+    return null;
+  }
+}