Cleanup.

src/androidTest/java/de/dennisguse/opentracks/EspressoCustomLayoutTest.java

@@ -9,10 +9,10 @@ import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.action.MotionEvents;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -83,7 +83,7 @@ public class EspressoCustomLayoutTest {
             }
 
             RecyclerView recyclerView = (RecyclerView) view;
-            RecyclerView.Adapter adapter = recyclerView.getAdapter();
+            RecyclerView.Adapter<?> adapter = recyclerView.getAdapter();
             assertThat(adapter.getItemCount(), is(expectedCount));
         }
     }

src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java

@@ -143,7 +143,7 @@ public class EspressoDeleteTrackTest {
     private static Matcher<View> childAtPosition(
             final Matcher<View> parentMatcher, final int position) {
 
-        return new TypeSafeMatcher<View>() {
+        return new TypeSafeMatcher<>() {
             @Override
             public void describeTo(Description description) {
                 description.appendText("Child at position " + position + " in parent ");
@@ -160,13 +160,15 @@ public class EspressoDeleteTrackTest {
     }
 
     public static Matcher<View> withListSize (final int size) {
-        return new TypeSafeMatcher<View> () {
+        return new TypeSafeMatcher<>() {
-            @Override public boolean matchesSafely (final View view) {
+            @Override
-                return ((ListView) view).getCount () == size;
+            public boolean matchesSafely(final View view) {
+                return ((ListView) view).getCount() == size;
             }
 
-            @Override public void describeTo (final Description description) {
+            @Override
-                description.appendText ("ListView should have " + size + " items");
+            public void describeTo(final Description description) {
+                description.appendText("ListView should have " + size + " items");
             }
         };
     }

src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java

@@ -144,7 +144,7 @@ public class EspressoEditTrackRecordingTest {
             // check track's name is "New Name"
             ViewInteraction textView = onView(
                     allOf(withId(R.id.stats_name_value),
-                            withParent(withParent(IsInstanceOf.<View>instanceOf(android.widget.ScrollView.class))),
+                            withParent(withParent(IsInstanceOf.instanceOf(android.widget.ScrollView.class))),
                             isDisplayed()));
             textView.check(matches(withText("New Name")));
         }
@@ -153,7 +153,7 @@ public class EspressoEditTrackRecordingTest {
     private static Matcher<View> childAtPosition(
             final Matcher<View> parentMatcher, final int position) {
 
-        return new TypeSafeMatcher<View>() {
+        return new TypeSafeMatcher<>() {
             @Override
             public void describeTo(Description description) {
                 description.appendText("Child at position " + position + " in parent ");

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java

@@ -107,7 +107,7 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_movingAccurate() throws Exception {
+    public void testOnLocationChangedAsync_movingAccurate() {
         // given
         Track.Id trackId = service.startNewTrack();
         service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
@@ -180,7 +180,7 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_slowMovingAccurate() throws Exception {
+    public void testOnLocationChangedAsync_slowMovingAccurate() {
         // given
         Track.Id trackId = service.startNewTrack();
         service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
@@ -225,7 +225,7 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_idle() throws Exception {
+    public void testOnLocationChangedAsync_idle() {
         // given
         Track.Id trackId = service.startNewTrack();
         service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
@@ -277,7 +277,7 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_idle_withMovement() throws Exception {
+    public void testOnLocationChangedAsync_idle_withMovement() {
         // given
         Track.Id trackId = service.startNewTrack();
         service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
@@ -337,7 +337,7 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_idle_withSensorData() throws Exception {
+    public void testOnLocationChangedAsync_idle_withSensorData() {
         // given
         Track.Id trackId = service.startNewTrack();
         service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);
@@ -432,7 +432,7 @@ public class TrackRecordingServiceTestLocation {
 
     @MediumTest
     @Test
-    public void testOnLocationChangedAsync_segment() throws Exception {
+    public void testOnLocationChangedAsync_segment() {
         // given
         Track.Id trackId = service.startNewTrack();
         service.getHandlerServer().setAltitudeSumManager(altitudeSumManager);

src/main/java/de/dennisguse/opentracks/chart/ChartPoint.java

@@ -77,6 +77,7 @@ public class ChartPoint {
         return power;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "ChartPoint{" + "timeOrDistance=" + timeOrDistance + '}';

src/main/java/de/dennisguse/opentracks/content/data/Distance.java

@@ -123,6 +123,7 @@ public class Distance {
         return Objects.hash(distance_m);
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Distance{" +

src/main/java/de/dennisguse/opentracks/content/data/Speed.java

@@ -1,5 +1,7 @@
 package de.dennisguse.opentracks.content.data;
 
+import androidx.annotation.NonNull;
+
 import java.time.Duration;
 import java.util.Objects;
 
@@ -132,6 +134,7 @@ public class Speed {
         return Objects.hash(speed_mps);
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Speed{" +

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataCycling.java

@@ -191,6 +191,7 @@ public final class SensorDataCycling {
                 return speed;
             }
 
+            @NonNull
             @Override
             public String toString() {
                 return "Data{" +

src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataRunning.java

@@ -1,5 +1,6 @@
 package de.dennisguse.opentracks.content.sensor;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
@@ -92,10 +93,12 @@ public final class SensorDataRunning extends SensorData<SensorDataRunning.Data>
             return cadence;
         }
 
+        @Nullable
         public Distance getDistance() {
             return distance;
         }
 
+        @NonNull
         @Override
         public String toString() {
             return "Data{" +

src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java

@@ -3,7 +3,6 @@ package de.dennisguse.opentracks.settings;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.widget.Toast;
 
 import androidx.fragment.app.FragmentActivity;

src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java

@@ -271,6 +271,7 @@ public class TrackStatisticsUpdater {
         return true;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "TrackStatisticsUpdater{" +