Cleanup using AndroidStudio analyze.

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

@@ -15,8 +15,6 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
-import android.Manifest;
-
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

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

@@ -13,8 +13,6 @@ import static org.hamcrest.Matchers.anything;
 import static de.dennisguse.opentracks.util.EspressoUtils.selectTabAtIndex;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
-import android.Manifest;
-
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

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

@@ -5,8 +5,6 @@ import android.os.Build;
 
 import androidx.test.rule.GrantPermissionRule;
 
-import de.dennisguse.opentracks.test.BuildConfig;
-
 public class TestUtil {
 
     public static GrantPermissionRule createGrantPermissionRule() {

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

@@ -5,8 +5,6 @@ import android.location.Location;
 
 import androidx.test.rule.ServiceTestRule;
 
-import java.util.concurrent.TimeoutException;
-
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
@@ -16,7 +14,7 @@ public class TrackRecordingServiceTestUtils {
     //TODO Workaround as service is not stopped on API23; thus sharedpreferences are not reset between tests.
     //TODO Anyhow, the service should re-create all it's resources if a recording starts and makes sure that there is no leftovers from previous recordings.
     @Deprecated
-    public static void resetService(ServiceTestRule mServiceRule, Context context) throws TimeoutException {
+    public static void resetService(ServiceTestRule mServiceRule, Context context) {
         // Let's use default values.
         PreferencesUtils.clear();
     }

src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertNull;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -226,25 +225,6 @@ public class TrackStatisticsUpdaterTest {
         assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
     }
 
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_not_moving() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_moving() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_not_moving_and_sensor_speed() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_moving_and_sensor_speed() {
-    }
 
     @Test
     public void addTrackPoint_maxSpeed_ignore_above_acceleration() {

src/main/java/de/dennisguse/opentracks/data/models/AtmosphericPressure.java

@@ -1,7 +1,5 @@
 package de.dennisguse.opentracks.data.models;
 
-import java.util.Objects;
-
 public record AtmosphericPressure(float value) {
 
     public static AtmosphericPressure ofPA(float value_Pa) {

src/main/java/de/dennisguse/opentracks/data/models/Cadence.java

@@ -1,9 +1,6 @@
 package de.dennisguse.opentracks.data.models;
 
-import androidx.annotation.NonNull;
-
 import java.time.Duration;
-import java.util.Objects;
 
 public record Cadence(float value_rpm) {
 

src/main/java/de/dennisguse/opentracks/data/models/HeartRate.java

@@ -1,9 +1,5 @@
 package de.dennisguse.opentracks.data.models;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
-
 public record HeartRate(float value) {
 
     public static HeartRate of(float value) {

src/main/java/de/dennisguse/opentracks/data/models/Power.java

@@ -1,9 +1,5 @@
 package de.dennisguse.opentracks.data.models;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
-
 public record Power(float value) {
 
     public static Power of(float value) {

src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java

@@ -45,7 +45,7 @@ import de.dennisguse.opentracks.util.StringUtils;
 
 /**
  * Convert {@link Track} incl. {@link Marker} and {@link TrackPoint} to KML version 2.3.
- * https://docs.opengeospatial.org/is/12-007r2/12-007r2.html
+ * <a href="https://docs.opengeospatial.org/is/12-007r2/12-007r2.html">...</a>
  *
  * @author Sandor Dornbush
  * @author Rodrigo Damazio

src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java

@@ -41,8 +41,8 @@ import de.dennisguse.opentracks.util.StringUtils;
 /**
  * Imports a GPX file.
  * Uses:
- * * https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd
+ * * <a href="https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd">...</a>
- * * https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd
+ * * <a href="https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd">...</a>
  * <p>
  * {@link de.dennisguse.opentracks.io.file.exporter.GPXTrackExporter} does not export information if a segment was started automatic or manually.
  * Therefore, all segments starts are marked as SEGMENT_START_AUTOMATIC.

src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java

@@ -135,7 +135,7 @@ public class TrackImporter {
             track.setUuid(UUID.randomUUID());
         }
 
-        Collections.sort(trackPoints, (o1, o2) -> {
+        trackPoints.sort((o1, o2) -> {
             if (o1.getTime().isBefore(o2.getTime())) {
                 return -1;
             }

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java

@@ -65,39 +65,36 @@ public class BluetoothRemoteSensorManager implements SensorConnector, AbstractBl
     private final BluetoothConnectionManagerCyclingPower cyclingPower = new BluetoothConnectionManagerCyclingPower(this);
     private final BluetoothConnectionRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothConnectionRunningSpeedAndCadence(this);
 
-    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
-        @Override
+        if (!started) return;
-        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (!started) return;
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_heart_rate_key, key)) {
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_heart_rate_key, key)) {
-                String address = PreferencesUtils.getBluetoothHeartRateSensorAddress();
+            String address = PreferencesUtils.getBluetoothHeartRateSensorAddress();
-                connect(heartRate, address);
+            connect(heartRate, address);
-            }
+        }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_cadence_key, key)) {
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_cadence_key, key)) {
-                String address = PreferencesUtils.getBluetoothCyclingCadenceSensorAddress();
+            String address = PreferencesUtils.getBluetoothCyclingCadenceSensorAddress();
-                connect(cyclingCadence, address);
+            connect(cyclingCadence, address);
-            }
+        }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_speed_key, key)) {
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_speed_key, key)) {
-                String address = PreferencesUtils.getBluetoothCyclingSpeedSensorAddress();
+            String address = PreferencesUtils.getBluetoothCyclingSpeedSensorAddress();
 
-                connect(cyclingSpeed, address);
+            connect(cyclingSpeed, address);
-            }
+        }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_power_key, key)) {
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_power_key, key)) {
-                String address = PreferencesUtils.getBluetoothCyclingPowerSensorAddress();
+            String address = PreferencesUtils.getBluetoothCyclingPowerSensorAddress();
 
-                connect(cyclingPower, address);
+            connect(cyclingPower, address);
-            }
+        }
 
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_running_speed_and_cadence_key, key)) {
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_running_speed_and_cadence_key, key)) {
-                String address = PreferencesUtils.getBluetoothRunningSpeedAndCadenceAddress();
+            String address = PreferencesUtils.getBluetoothRunningSpeedAndCadenceAddress();
 
-                connect(runningSpeedAndCadence, address);
+            connect(runningSpeedAndCadence, address);
-            }
         }
     };
 

src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java

@@ -23,8 +23,6 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 

src/main/java/de/dennisguse/opentracks/sensors/ServiceMeasurementUUID.java

@@ -1,8 +1,5 @@
 package de.dennisguse.opentracks.sensors;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
 import java.util.UUID;
 
 public record ServiceMeasurementUUID(UUID serviceUUID, UUID measurementUUID) {

src/main/java/de/dennisguse/opentracks/services/RecordingStatus.java

@@ -1,9 +1,6 @@
 package de.dennisguse.opentracks.services;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
-import java.util.Objects;
 
 import de.dennisguse.opentracks.data.models.Track;
 

src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java

@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,7 +23,7 @@ public class AggregatedStatistics {
         }
 
         dataList.addAll(dataMap.values());
-        Collections.sort(dataList, (o1, o2) -> {
+        dataList.sort((o1, o2) -> {
             if (o1.getCountTracks() == o2.getCountTracks()) {
                 return o1.getActivityType().compareTo(o2.getActivityType());
             }

src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/CsvLayoutUtils.java

@@ -35,7 +35,6 @@ public final class CsvLayoutUtils {
 
     /**
      * @param csvField Layout's field in a CSV format.
-     * @return List of field parts or null if it's malformed.
      */
     @Nullable
     public static String[] getCsvFieldParts(@Nullable String csvField) {

src/main/java/de/dennisguse/opentracks/util/EGM2008Utils.java

@@ -16,7 +16,7 @@ import de.dennisguse.opentracks.data.models.Altitude;
  * Converts WGS84 altitude to EGM2008 (should be close to height above sea level).
  * <p>
  * Uses <a href="https://geographiclib.sourceforge.io/">GeographicLib</a>] EGM2008 5minute undulation data.
- * https://geographiclib.sourceforge.io/html/geoid.html
+ * <a href="https://geographiclib.sourceforge.io/html/geoid.html">...</a>
  * <p>
  * File starts at 90N, 0E (North pole) and is encoded in parallel bands as unsigned shorts.
  */

src/main/java/de/dennisguse/opentracks/util/FileUtils.java

@@ -47,7 +47,7 @@ public class FileUtils {
 
     /**
      * The maximum FAT32 path length. See the FAT32 spec at
-     * http://msdn.microsoft.com/en-us/windows/hardware/gg463080
+     * <a href="http://msdn.microsoft.com/en-us/windows/hardware/gg463080">...</a>
      */
     static final int MAX_FAT32_PATH_LENGTH = 260;
 

src/main/java/de/dennisguse/opentracks/util/StringUtils.java

@@ -232,7 +232,7 @@ public class StringUtils {
     }
 
     /**
-     * Gets the time, in milliseconds, from an XML date time string (ISO8601) as defined at http://www.w3.org/TR/xmlschema-2/#dateTime
+     * Gets the time, in milliseconds, from an XML date time string (ISO8601) as defined at <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">...</a>
      * Let's be lenient: if timezone information is not provided, UTC will be used.
      *
      * @param xmlDateTime the XML date time string

src/main/res/drawable/ic_help_24dp.xml

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"
         android:fillColor="#000000" />

src/main/res/layout/help.xml

@@ -12,7 +12,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="@drawable/ic_help_black_24dp"
+            app:navigationIcon="@drawable/ic_help_24dp"
             app:title="@string/menu_help" />
     </com.google.android.material.appbar.AppBarLayout>
 

src/main/res/menu/track_list.xml

@@ -32,7 +32,7 @@ limitations under the License.
         android:title="@string/menu_settings" />
     <item
         android:id="@+id/track_list_help"
-        android:icon="@drawable/ic_help_black_24dp"
+        android:icon="@drawable/ic_help_24dp"
         android:title="@string/menu_help" />
 
 </menu>