karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Merging Matthew's changes.

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-01-10 15:41:41 -02:00
parent 63c97fadc6 c990fb6fe7
commit 4e3ad38087
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+3 -2
View File
@@ -24,6 +24,7 @@ import android.location.Location;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.charset.Charset;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
@@ -58,8 +59,8 @@ public class GpxTrackWriter implements TrackFormatWriter {
@Override @Override
public void writeHeader() { public void writeHeader() {
if (pw != null) { if (pw != null) {
pw.println("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" "); pw.format("<?xml version=\"1.0\" encoding=\"%s\" standalone=\"yes\"?>\n",
pw.println("standalone=\"yes\"?>"); Charset.defaultCharset().name());
pw.println("<?xml-stylesheet type=\"text/xsl\" href=\"details.xsl\"?>"); pw.println("<?xml-stylesheet type=\"text/xsl\" href=\"details.xsl\"?>");
pw.println("<gpx"); pw.println("<gpx");
pw.println(" version=\"1.0\""); pw.println(" version=\"1.0\"");
MyTracks/src/com/google/android/apps/mytracks/io/TcxTrackWriter.java
+3 -1
View File
@@ -27,6 +27,7 @@ import android.os.Build;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.charset.Charset;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
@@ -77,7 +78,8 @@ public class TcxTrackWriter implements TrackFormatWriter {
if (pw == null) { if (pw == null) {
return; return;
} }
pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>"); pw.format("<?xml version=\"1.0\" encoding=\"%s\" standalone=\"no\" ?>\n",
Charset.defaultCharset().name());
pw.print("<TrainingCenterDatabase "); pw.print("<TrainingCenterDatabase ");
pw.print("xmlns=\"http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2\" "); pw.print("xmlns=\"http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2\" ");
pw.print("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "); pw.print("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ");