Code cleanup using AndroidStudio's Analyze feature.

RELEASE.sh

@@ -27,7 +27,7 @@ cp "$CHANGELOG_DIR/next_release.txt" "$CHANGELOG_FILE"
 sed -i "s/(versionName)/$VERSIONNAME/" "$CHANGELOG_FILE"
 
 echo -e "\nGit commit since last release\n------------"
-git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline
+git log "$(git describe --tags --abbrev=0)..HEAD" --no-merges --oneline
 
 echo -e "\nPlease edit the changelog for the new release"
 gedit -w "$CHANGELOG_FILE"

src/androidTest/java/de/dennisguse/opentracks/services/sensors/ElevationSumManagerTest.java

@@ -9,7 +9,7 @@ import org.junit.Test;
  */
 public class ElevationSumManagerTest {
 
-    private ElevationSumManager elevationSumManager = new ElevationSumManager();
+    private final ElevationSumManager elevationSumManager = new ElevationSumManager();
 
     private static void addSensorValue(ElevationSumManager elevationSumManager, float[] values) {
         for (float f : values) {

src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java

@@ -73,7 +73,7 @@ public class MarkerEditActivity extends AbstractActivity {
 
     private Uri photoUri;
     private Uri photoUriOriginal;
-    private List<Uri> photoUriDeleteList = new ArrayList<>();
+    private final List<Uri> photoUriDeleteList = new ArrayList<>();
     private boolean hasCamera;
 
     private boolean isNewMarker;

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

@@ -360,7 +360,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
         public boolean resolve() {
             if (autoConflict == CONFLICT_NONE) {
                 Track track = contentProviderUtils.getTrack(trackId);
-                viewBinding.exportProgressAlertIcon.setImageDrawable(getDrawable(R.drawable.ic_report_problem_24));
+                viewBinding.exportProgressAlertIcon.setImageDrawable(ContextCompat.getDrawable(ExportActivity.this, R.drawable.ic_report_problem_24));
                 viewBinding.exportProgressAlertMsg.setText(getString(R.string.export_track_already_exists_msg, track.getName()));
                 setConflictVisibility(View.VISIBLE);
                 return false;

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

@@ -53,7 +53,7 @@ public class KmzTrackExporter implements TrackExporter {
     private final FileTrackExporter fileTrackExporter;
 
     private final boolean exportPhotos;
-    private Context context;
+    private final Context context;
 
     /**
      * Constructor.

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

@@ -24,6 +24,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
@@ -161,12 +162,12 @@ public class ImportActivity extends FragmentActivity {
             viewBinding.importProgressLeftButton.setVisibility(View.VISIBLE);
             viewBinding.importProgressLeftButton.setText(getString(R.string.generic_show_errors));
             viewBinding.importProgressLeftButton.setOnClickListener((view) -> ErrorListDialog.showDialog(getSupportFragmentManager(), getString(R.string.import_error_list_dialog_title), summary.getFileErrors()));
-            viewBinding.importProgressAlertIcon.setImageDrawable(getDrawable(R.drawable.ic_report_problem_24));
+            viewBinding.importProgressAlertIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_report_problem_24));
             String msg = getResources().getQuantityString(R.plurals.generic_completed_with_errors, summary.getErrorCount(), summary.getErrorCount());
             viewBinding.importProgressAlertMsg.setText(msg);
         } else {
             viewBinding.importProgressLeftButton.setVisibility(View.GONE);
-            viewBinding.importProgressAlertIcon.setImageDrawable(getDrawable(R.drawable.ic_dialog_success_24dp));
+            viewBinding.importProgressAlertIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_dialog_success_24dp));
             viewBinding.importProgressAlertMsg.setText(getString(R.string.generic_completed));
         }
     }

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

@@ -63,12 +63,12 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
 
     private boolean trackStarted = false;
     private String extendedDataType;
-    private ArrayList<TrackPoint> trackPoints = new ArrayList<>();
+    private final ArrayList<TrackPoint> trackPoints = new ArrayList<>();
-    private ArrayList<Float> speedList = new ArrayList<>();
+    private final ArrayList<Float> speedList = new ArrayList<>();
-    private ArrayList<Float> cadenceList = new ArrayList<>();
+    private final ArrayList<Float> cadenceList = new ArrayList<>();
-    private ArrayList<Float> heartRateList = new ArrayList<>();
+    private final ArrayList<Float> heartRateList = new ArrayList<>();
-    private ArrayList<Float> powerList = new ArrayList<>();
+    private final ArrayList<Float> powerList = new ArrayList<>();
-    private ArrayList<Float> elevationGainList = new ArrayList<>();
+    private final ArrayList<Float> elevationGainList = new ArrayList<>();
 
     public KmlFileTrackImporter(Context context) {
         this(context, new ContentProviderUtils(context));

src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java

@@ -25,7 +25,7 @@ class GpsStatus {
 
     private GpsStatusValue gpsStatus = GpsStatusValue.GPS_NONE;
     private GpsStatusListener client;
-    private Context context;
+    private final Context context;
 
     // Last location. It can be null.
     private Location lastLocation = null;
@@ -51,7 +51,7 @@ class GpsStatus {
         }
     }
 
-    private Handler gpsStatusHandler;
+    private final Handler gpsStatusHandler;
     private GpsStatusRunner gpsStatusRunner = null;
 
     /**

src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java

@@ -12,7 +12,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 
 public class HandlerServer {
 
-    private static String TAG = HandlerServer.class.getSimpleName();
+    private static final String TAG = HandlerServer.class.getSimpleName();
 
     private final LocationHandler locationHandler;
     private final HandlerServerInterface service;

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

@@ -5,18 +5,18 @@ import android.hardware.SensorManager;
 public class PressureSensorUtils {
 
     //Everything above is considered a meaningful change in elevation.
-    private static float ELEVATION_CHANGE_DIFF_M = 3.0f;
+    private static final float ELEVATION_CHANGE_DIFF_M = 3.0f;
 
-    private static float EXPONENTIAL_SMOOTHING = 0.3f;
+    private static final float EXPONENTIAL_SMOOTHING = 0.3f;
 
     private PressureSensorUtils() {
     }
 
     public static class ElevationChange {
 
-        private float currentSensorValue_hPa;
+        private final float currentSensorValue_hPa;
 
-        private float elevationChange_m;
+        private final float elevationChange_m;
 
         public ElevationChange(float currentSensorValue_hPa, float elevationChange_m) {
             this.currentSensorValue_hPa = currentSensorValue_hPa;

src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java

@@ -8,7 +8,7 @@ import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 public class IntervalStatistics {
-    private List<Interval> intervalList = new ArrayList<>();
+    private final List<Interval> intervalList = new ArrayList<>();
     private float distanceInterval_m;
 
     /**

src/main/res/layout/aggregated_stats.xml

@@ -20,21 +20,18 @@
 
             <View
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="match_parent" />
-                android:layout_weight="1" />
         
             <TextView
                 style="@style/TextLarge"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="4"
                 android:gravity="center_horizontal|center_vertical"
                 android:text="@string/aggregated_stats_empty_message" />
 
-            <View
+        <View
-                android:layout_width="0dp"
+            android:layout_width="0dp"
-                android:layout_height="match_parent"
+            android:layout_height="match_parent" />
-                android:layout_weight="1" />
 
     </RelativeLayout>
 

src/main/res/layout/export_activity.xml

@@ -14,7 +14,7 @@
     <androidx.core.widget.NestedScrollView
         android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_weight="1"

src/main/res/layout/import_activity.xml

@@ -12,7 +12,7 @@
     <androidx.core.widget.NestedScrollView
         android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_weight="1"