From 7fa9df1f99c74ea0ac8e991c931e2ae035c33317 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 17 Aug 2019 00:58:52 +0200 Subject: [PATCH] Cleanup. --- .../content/CustomContentProviderUtilsImplTest.java | 7 ++----- .../opentracks/content/DescriptionGeneratorImplTest.java | 2 +- .../opentracks/content/DescriptionGenerator.java | 7 +------ .../opentracks/content/DescriptionGeneratorImpl.java | 4 +--- .../opentracks/io/file/exporter/KmlTrackWriter.java | 2 +- .../java/de/dennisguse/opentracks/util/IntentUtils.java | 8 ++++---- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java index 4d2539866..e799fe071 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java @@ -32,7 +32,6 @@ import org.mockito.junit.MockitoJUnitRunner; import java.util.ArrayList; import java.util.List; -import java.util.Vector; import java.util.concurrent.atomic.AtomicInteger; import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory; @@ -455,8 +454,7 @@ public class CustomContentProviderUtilsImplTest { } @Override - public String generateTrackDescription(Track aTrack, Vector distances, - Vector elevations, boolean html) { + public String generateTrackDescription(Track aTrack, boolean html) { return null; } }; @@ -511,8 +509,7 @@ public class CustomContentProviderUtilsImplTest { } @Override - public String generateTrackDescription(Track aTrack, Vector distances, - Vector elevations, boolean html) { + public String generateTrackDescription(Track aTrack, boolean html) { return null; } }; diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java index 2c06db464..91cd97381 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java @@ -88,7 +88,7 @@ public class DescriptionGeneratorImplTest { + "Min grade: 11 %
" + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "
"; - Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, null, null, true)); + Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true)); } /** diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java index be2a5683f..ee046ee01 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java @@ -17,8 +17,6 @@ package de.dennisguse.opentracks.content; import de.dennisguse.opentracks.stats.TripStatistics; -import java.util.Vector; - /** * An interface for an object that can generate descriptions of track and * waypoint. @@ -31,12 +29,9 @@ public interface DescriptionGenerator { * Generates a track description. * * @param track the track - * @param distances a vector of distances to generate the elevation chart - * @param elevations a vector of elevations to generate the elevation chart * @param html true to output html, false to output plain text */ - String generateTrackDescription( - Track track, Vector distances, Vector elevations, boolean html); + String generateTrackDescription(Track track, boolean html); /** * Generate a waypoint description from a trip statistics. diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java index 5625bb043..95cc1f924 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java @@ -20,8 +20,6 @@ import android.content.Context; import androidx.annotation.VisibleForTesting; -import java.util.Vector; - import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.StringUtils; @@ -44,7 +42,7 @@ public class DescriptionGeneratorImpl implements DescriptionGenerator { } @Override - public String generateTrackDescription(Track track, Vector distances, Vector elevations, boolean html) { + public String generateTrackDescription(Track track, boolean html) { String paragraphSeparator = html ? HTML_PARAGRAPH_SEPARATOR : TEXT_PARAGRAPH_SEPARATOR; String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK; StringBuilder builder = new StringBuilder(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java index 359c2e906..a9204fccd 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java @@ -208,7 +208,7 @@ public class KmlTrackWriter implements TrackWriter { printWriter.println(""); printWriter.println(""); String name = context.getString(R.string.marker_label_end, track.getName()); - String description = descriptionGenerator.generateTrackDescription(track, null, null, false); + String description = descriptionGenerator.generateTrackDescription(track, false); writePlacemark(name, "", description, END_STYLE, endLocation); } } diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index d39974651..6ef60e52d 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -20,14 +20,14 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; +import java.io.File; + +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.DescriptionGeneratorImpl; import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.Waypoint; import de.dennisguse.opentracks.io.file.TrackFileFormat; -import de.dennisguse.opentracks.R; - -import java.io.File; /** * Utilities for creating intents. @@ -60,7 +60,7 @@ public class IntentUtils { */ public static Intent newShareFileIntent(Context context, long trackId, String filePath, TrackFileFormat trackFileFormat) { Track track = ContentProviderUtils.Factory.get(context).getTrack(trackId); - String trackDescription = track == null ? "" : new DescriptionGeneratorImpl(context).generateTrackDescription(track, null, null, false); + String trackDescription = track == null ? "" : new DescriptionGeneratorImpl(context).generateTrackDescription(track, false); return new Intent(Intent.ACTION_SEND) .putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(filePath)))