From ddd1efeb583e2aa938bbc7198b9bfe606fdfd024 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 19 Oct 2025 18:05:11 +0200 Subject: [PATCH] Cleanup: use .isEmpty() (except for CharSequence and StringBuilder as it requires SDK33). --- .../dennisguse/opentracks/settings/PreferencesUtilsTest.java | 4 ++-- src/main/java/de/dennisguse/opentracks/chart/ChartView.java | 2 +- .../de/dennisguse/opentracks/share/DescriptionGenerator.java | 2 +- .../java/de/dennisguse/opentracks/ui/util/ListItemUtils.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java index f84aac6e8..b341fca82 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java @@ -90,7 +90,7 @@ public class PreferencesUtilsTest { // then assertEquals(1, recordingLayouts.size()); - assertTrue(recordingLayouts.get(0).getFields().size() > 0); + assertFalse(recordingLayouts.get(0).getFields().isEmpty()); assertEquals(recordingLayouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout)); assertTrue(recordingLayouts.get(0).getFields().stream().anyMatch(DataField::isVisible)); } @@ -107,7 +107,7 @@ public class PreferencesUtilsTest { RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout(); // then - assertTrue(recordingLayout.getFields().size() > 0); + assertFalse(recordingLayout.getFields().isEmpty()); assertEquals(recordingLayout.getName(), context.getString(R.string.stats_custom_layout_default_layout)); assertTrue(recordingLayout.getFields().stream().anyMatch(DataField::isVisible)); } diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index bf8413d2a..3093b70d5 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -880,7 +880,7 @@ public class ChartView extends View { break; } } - if (firstChartValueSeries != null && chartPoints.size() > 0) { + if (firstChartValueSeries != null && !chartPoints.isEmpty()) { int dx = getX(maxX) - pointer.getIntrinsicWidth() / 2; double value = firstChartValueSeries.extractDataFromChartPoint(last); int dy = getY(firstChartValueSeries, value) - pointer.getIntrinsicHeight(); diff --git a/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java index 2058a0fe5..6695b7df1 100644 --- a/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java @@ -88,7 +88,7 @@ public class DescriptionGenerator { * @param lineBreak the line break */ private void writeString(String text, StringBuilder builder, int resId, String lineBreak) { - if (text == null || text.length() == 0) { + if (text == null || text.isEmpty()) { text = context.getString(R.string.value_unknown); } builder.append(context.getString(resId, text)); diff --git a/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java index c28b37221..cc4c6e17f 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java @@ -49,13 +49,13 @@ public class ListItemUtils { */ private static String getTimeDistance(String totalTime, String totalDistance) { StringBuilder builder = new StringBuilder(); - if (totalTime != null && totalTime.length() != 0) { + if (totalTime != null && !totalTime.isEmpty()) { if (builder.length() != 0) { builder.append(" ‧ "); } builder.append(totalTime); } - if (totalDistance != null && totalDistance.length() != 0) { + if (totalDistance != null && !totalDistance.isEmpty()) { if (builder.length() != 0) { builder.append(" "); }