diff --git a/RELEASE.sh b/RELEASE.sh index 2b6504c1d..8db19de1c 100755 --- a/RELEASE.sh +++ b/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" diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/ElevationSumManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/sensors/ElevationSumManagerTest.java index 6c1c2b40c..e997fc7b1 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/sensors/ElevationSumManagerTest.java +++ b/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) { diff --git a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java index 3d7c17c25..0a4426f3f 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java +++ b/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 photoUriDeleteList = new ArrayList<>(); + private final List photoUriDeleteList = new ArrayList<>(); private boolean hasCamera; private boolean isNewMarker; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java index 37510133c..35251e4a9 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java +++ b/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; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index d06e071b2..4c2489c3f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/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. diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java index c2408e82e..4f26cc9ab 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java +++ b/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)); } } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java index cb4ca7ea3..3905fe4a7 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java +++ b/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 trackPoints = new ArrayList<>(); - private ArrayList speedList = new ArrayList<>(); - private ArrayList cadenceList = new ArrayList<>(); - private ArrayList heartRateList = new ArrayList<>(); - private ArrayList powerList = new ArrayList<>(); - private ArrayList elevationGainList = new ArrayList<>(); + private final ArrayList trackPoints = new ArrayList<>(); + private final ArrayList speedList = new ArrayList<>(); + private final ArrayList cadenceList = new ArrayList<>(); + private final ArrayList heartRateList = new ArrayList<>(); + private final ArrayList powerList = new ArrayList<>(); + private final ArrayList elevationGainList = new ArrayList<>(); public KmlFileTrackImporter(Context context) { this(context, new ContentProviderUtils(context)); diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java index 21fa0e8af..e376b79d5 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java +++ b/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; /** diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java b/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java index fad2af47d..1d3c15f0c 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java +++ b/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; diff --git a/src/main/java/de/dennisguse/opentracks/util/PressureSensorUtils.java b/src/main/java/de/dennisguse/opentracks/util/PressureSensorUtils.java index 11aed2675..bcc402131 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PressureSensorUtils.java +++ b/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; diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java b/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java index 124ac0c7a..193ddf9cc 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java +++ b/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 intervalList = new ArrayList<>(); + private final List intervalList = new ArrayList<>(); private float distanceInterval_m; /** diff --git a/src/main/res/layout/aggregated_stats.xml b/src/main/res/layout/aggregated_stats.xml index 0c6949b46..3110b5e5e 100644 --- a/src/main/res/layout/aggregated_stats.xml +++ b/src/main/res/layout/aggregated_stats.xml @@ -20,21 +20,18 @@ + android:layout_height="match_parent" /> - + diff --git a/src/main/res/layout/export_activity.xml b/src/main/res/layout/export_activity.xml index 2a1029017..f9be645dd 100644 --- a/src/main/res/layout/export_activity.xml +++ b/src/main/res/layout/export_activity.xml @@ -14,7 +14,7 @@ + android:layout_height="0dp"> + android:layout_height="0dp">