From dbd8e6c0e9a9b8c8f598ab80e0f1d3552209376b Mon Sep 17 00:00:00 2001
From: Bartlomiej Niechwiej <Bartlomiej Niechwiej@localhost>
Date: Tue, 26 Oct 2010 19:38:51 -0700
Subject: [PATCH] Merge with 5ed61c63ba59f4748231ea14bbbc222423d0b08a

---
 .../src/com/google/android/apps/mytracks/util/FileUtils.java  | 4 +---
 .../com/google/android/apps/mytracks/util/FileUtilsTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
index c2a380e88..6c6ca7af0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
@@ -37,7 +37,7 @@ public class FileUtils {
    * A set of characters that are prohibited from being in file names.
    */
   private static final Pattern PROHIBITED_CHAR_PATTERN =
-      Pattern.compile("[^ A-Za-z0-9_.()]+");
+      Pattern.compile("[^ A-Za-z0-9_.()-]+");
 
   /**
    * Builds a path inside the My Tracks directory in the SD card.
@@ -69,8 +69,6 @@ public class FileUtils {
    * Normalizes the input string and make sure it is a valid fat32 file name.
    *
    * @param name the name to normalize
-   * @param overheadSize the number of additional characters that will be added
-   *        to the name after sanitization
    * @return the sanitized name
    */
   String sanitizeName(String name) {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
index 715370bab..01b44c6b6 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
@@ -31,8 +31,8 @@ import junit.framework.TestCase;
  * @author Rodrigo Damazio
  */
 public class FileUtilsTest extends TestCase {
-  private static final String ORIGINAL_NAME = "Swim\10ming ^across: the/ pacific (ocean).";
-  private static final String SANITIZED_NAME = "Swimming across the pacific (ocean).";
+  private static final String ORIGINAL_NAME = "Swim\10ming-^across: the/ pacific (ocean).";
+  private static final String SANITIZED_NAME = "Swimming-across the pacific (ocean).";
 
   private FileUtils fileUtils;
   private Set<String> existingFiles;