From de23a32c9630d35253436d05a7e16acf97b106c2 Mon Sep 17 00:00:00 2001
From: Matthew Simmons <simmonmt@google.com>
Date: Wed, 5 Jan 2011 19:54:49 -0500
Subject: [PATCH] Write the VM's charset in the GPX file's XML header, rather
 than using a hard-coded value.  Per the Android docs, the default charset for
 Android is UTF-8.

---
 .../com/google/android/apps/mytracks/io/GpxTrackWriter.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
index 6054dc9a5..6c7978b11 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
@@ -24,6 +24,7 @@ import android.location.Location;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
@@ -58,8 +59,8 @@ public class GpxTrackWriter implements TrackFormatWriter {
   @Override
   public void writeHeader() {
     if (pw != null) {
-      pw.println("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ");
-      pw.println("standalone=\"yes\"?>");
+      pw.format("<?xml version=\"1.0\" encoding=\"%s\" standalone=\"yes\"?>\n",
+          Charset.defaultCharset().name());
       pw.println("<?xml-stylesheet type=\"text/xsl\" href=\"details.xsl\"?>");
       pw.println("<gpx");
       pw.println(" version=\"1.0\"");