From f21200a7ec7e3d64bd8f355205fc0df4ef928633 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 19 Sep 2019 19:29:12 +0200 Subject: [PATCH] UnitConversation: always use double for division. Fixed wrong computation (00:00) of total time. --- .../opentracks/content/DescriptionGeneratorImpl.java | 4 +--- .../java/de/dennisguse/opentracks/util/UnitConversions.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java index 8273802d9..24d88cae4 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java @@ -138,9 +138,7 @@ public class DescriptionGeneratorImpl implements DescriptionGenerator { writeGrade(stats.getMinGrade(), builder, R.string.description_min_grade, lineBreak); // Recorded time - builder.append( - context.getString(R.string.description_recorded_time, - StringUtils.formatDateTime(context, stats.getStartTime()))); + builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(context, stats.getStartTime()))); builder.append(lineBreak); return builder.toString(); diff --git a/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java b/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java index ab6c1b124..8a7e8b53f 100644 --- a/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java +++ b/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java @@ -29,7 +29,7 @@ public class UnitConversions { // 1 second in milliseconds public static final long ONE_SECOND = UnitConversions.S_TO_MS; // multiplication factor to convert milliseconds to seconds - public static final double MS_TO_S = 1 / S_TO_MS; + public static final double MS_TO_S = 1d / S_TO_MS; // multiplication factor to convert minutes to seconds public static final double MIN_TO_S = 60.0; // multiplication factor to convert seconds to minutes