diff --git a/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java b/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java index c285a2952..012e9623d 100644 --- a/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java @@ -7,7 +7,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -40,17 +39,12 @@ public class ShowErrorActivity extends AbstractActivity { private void reportBug() { Uri uriUrl; - try { - uriUrl = Uri.parse( - String.format( - getString(R.string.report_issue_link), - URLEncoder.encode(viewBinding.textViewError.getText().toString(), StandardCharsets.UTF_8.toString()) - ) - ); - } catch (final UnsupportedEncodingException ignored) { - // can't happen as UTF-8 is always available - return; - } + uriUrl = Uri.parse( + String.format( + getString(R.string.report_issue_link), + URLEncoder.encode(viewBinding.textViewError.getText().toString(), StandardCharsets.UTF_8) + ) + ); Intent intent = new Intent(Intent.ACTION_VIEW, uriUrl); startActivity(intent); } diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index ef7285aba..be630ce0a 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -41,9 +41,9 @@ import androidx.core.view.GestureDetectorCompat; import java.text.NumberFormat; import java.time.Duration; import java.util.ArrayList; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Iterator; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Marker; @@ -679,12 +679,13 @@ public class ChartView extends View { private record TitlePosition( int line, // line number (starts at 1, top to bottom numbering) int xPos // x position in points (starts at 0, left to right indexing) - ) {}; + ) {} + private record TitleDimensions( int lineCount, // number of lines the titles will take int lineHeight, // height of a line (all lines have the same height) List titlePositions // positions of visible titles (the order corresponds to seriesList) - ) {}; + ) {} /** * Draws series titles. @@ -711,7 +712,7 @@ public class ChartView extends View { private TitleDimensions getTitleDimensions() { int lineCnt = 1; int lineHeight = 0; - List tps = new ArrayList(); + List tps = new ArrayList<>(); int xPosInLine = spacer; for (ChartValueSeries chartValueSeries : seriesList) { if (chartValueSeries.isEnabled() && chartValueSeries.hasData() || allowIfEmpty(chartValueSeries)) { diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Marker.java b/src/main/java/de/dennisguse/opentracks/data/models/Marker.java index 0a72027c0..e25e8a1ff 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/Marker.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/Marker.java @@ -263,7 +263,7 @@ public final class Marker { } public boolean hasPhoto() { - return photoUrl != null && !"".equals(photoUrl); + return photoUrl != null && !photoUrl.isEmpty(); } public record Id(long id) implements Parcelable { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java index 535d14486..d3fccf19b 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java @@ -310,7 +310,7 @@ public class GPXTrackExporter implements TrackExporter { } public Distance writeTrackPoint(ZoneOffset zoneOffset, TrackPoint trackPoint, List sensorPoints, Distance trackDistance) { - Distance cumulativeDistance = null; + Distance cumulativeDistance; printWriter.println(""); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java index aec86930a..a1c47c685 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java @@ -498,7 +498,7 @@ public class KMLTrackExporter implements TrackExporter { } private void writeTypeLocalized(String localizedValue) { - if (localizedValue == null || localizedValue.equals("")) { + if (localizedValue == null || localizedValue.isEmpty()) { return; } printWriter.println(""); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java index 1d278f126..457388b41 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java @@ -414,7 +414,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac Float value = null; if (content != null) { content = content.trim(); - if (!"".equals(content)) { + if (!content.isEmpty()) { try { value = Float.parseFloat(content); } catch (NumberFormatException e) { diff --git a/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java b/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java index fc5971383..0d63227bf 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java @@ -20,9 +20,7 @@ public class GainManager implements SensorConnector { private final SensorManager.SensorDataChangedObserver listener; - private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> { - connect(); - }; + private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> connect(); private Context context; private Handler handler; diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java index 0858226eb..10116be42 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/Aggregator.java @@ -55,7 +55,7 @@ public abstract class Aggregator { /** * Reset long term aggregated values (more than derived from previous SensorData). e.g. overall distance. */ - public void reset() {}; + public void reset() {} /** * Is the data recent considering the current time. diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 5f2077091..28d10b8dd 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -229,7 +229,7 @@ public class PreferencesUtils { //TODO Check if actually needed or can be superseeded by a flexible default in getUnit() public static void applyDefaultUnit() { - if (getString(R.string.stats_units_key, "").equals("")) { + if (getString(R.string.stats_units_key, "").isEmpty()) { if (!Locale.US.equals(Locale.getDefault())) { setUnit(UnitSystem.METRIC); } else { diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java index 01361c357..20c482a30 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java @@ -114,9 +114,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar); setSupportActionBar(viewBinding.markerListToolbar); - viewBinding.bottomAppBarLayout.bottomAppBar.setNavigationOnClickListener(item -> { - finish(); - }); + viewBinding.bottomAppBarLayout.bottomAppBar.setNavigationOnClickListener(item -> finish()); } @Override diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index ef02ee51f..b3aca73dc 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -201,7 +201,6 @@ limitations under the License. / 顯示錯誤 - 已完成,但有一個錯誤 已完成,但有 %1$d 個錯誤 完成