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

Upgraded some test cases.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-16 22:45:55 +02:00
parent 0b2b306022
commit 0d01c0ee40
19 changed files with 370 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
+2 -1
View File
@@ -3,6 +3,7 @@ package com.google.android.apps.mytracks.io.file;
import com.google.android.apps.mytracks.io.file.exporter.GpxTrackWriter;
import com.google.android.apps.mytracks.io.file.exporter.KmlTrackWriter;
import com.google.android.apps.mytracks.io.file.exporter.TrackWriter;
import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.os.Parcel;
@@ -23,7 +24,7 @@ public enum TrackFileFormat implements Parcelable {
GPX {
@Override
public TrackWriter newTrackWriter(Context context, boolean multiple, boolean playTrack) {
return new GpxTrackWriter(context);
return new GpxTrackWriter(context.getString(R.string.send_google_by_my_tracks, "", ""));
}
};
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java
+6 -8
View File
@@ -16,14 +16,12 @@
package com.google.android.apps.mytracks.io.file.exporter;
import android.location.Location;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.content.Waypoint;
import com.google.android.apps.mytracks.io.file.TrackFileFormat;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.location.Location;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -52,11 +50,11 @@ public class GpxTrackWriter implements TrackWriter {
COORDINATE_FORMAT.setGroupingUsed(false);
}
private final Context context;
private final String creator;
private PrintWriter printWriter;
public GpxTrackWriter(Context context) {
this.context = context;
public GpxTrackWriter(String creator) {
this.creator = creator;
}
@Override
@@ -84,7 +82,7 @@ public class GpxTrackWriter implements TrackWriter {
printWriter.println("<gpx");
printWriter.println("version=\"1.1\"");
printWriter.println(
"creator=\"" + context.getString(R.string.send_google_by_my_tracks, "", "") + "\"");
"creator=\"" + creator + "\"");
printWriter.println("xmlns=\"http://www.topografix.com/GPX/1/1\"");
printWriter.println(
"xmlns:topografix=\"http://www.topografix.com/GPX/Private/TopoGrafix/0/1\"");
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
+1 -2
View File
@@ -87,8 +87,7 @@ public class KmlTrackWriter implements TrackWriter {
}
@VisibleForTesting
KmlTrackWriter(Context context, boolean multiple, boolean playTrack,
DescriptionGenerator descriptionGenerator) {
KmlTrackWriter(Context context, boolean multiple, boolean playTrack, DescriptionGenerator descriptionGenerator) {
this.context = context;
this.multiple = multiple;
this.playTrack = playTrack;