From 1a5d06f9c638a206d2c71e2f9dcc0dac549cd22b Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 7 Feb 2026 19:20:48 +0100 Subject: [PATCH] Cleanup: renamed IntentDashboardUtils.java to DataProvider. --- .../{DashboardAPITest.java => DataProviderTest.java} | 2 +- .../java/de/dennisguse/opentracks/TrackListActivity.java | 4 ++-- .../de/dennisguse/opentracks/TrackRecordedActivity.java | 4 ++-- .../de/dennisguse/opentracks/TrackRecordingActivity.java | 4 ++-- .../DataProvider.java} | 9 ++++----- .../dennisguse/opentracks/publicapi/StartRecording.java | 3 +-- 6 files changed, 12 insertions(+), 14 deletions(-) rename src/androidTest/java/de/dennisguse/opentracks/publicapi/{DashboardAPITest.java => DataProviderTest.java} (99%) rename src/main/java/de/dennisguse/opentracks/{util/IntentDashboardUtils.java => publicapi/DataProvider.java} (95%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/publicapi/DashboardAPITest.java b/src/androidTest/java/de/dennisguse/opentracks/publicapi/DataProviderTest.java similarity index 99% rename from src/androidTest/java/de/dennisguse/opentracks/publicapi/DashboardAPITest.java rename to src/androidTest/java/de/dennisguse/opentracks/publicapi/DataProviderTest.java index 4a3ffde61..df514e074 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/publicapi/DashboardAPITest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/publicapi/DataProviderTest.java @@ -16,7 +16,7 @@ import org.junit.runner.RunWith; import de.dennisguse.opentracks.data.ContentProviderUtils; @RunWith(AndroidJUnit4.class) -public class DashboardAPITest { +public class DataProviderTest { private final Context context = ApplicationProvider.getApplicationContext(); diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index dc9faa710..053c4b1b9 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -47,6 +47,7 @@ import java.util.Objects; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.TrackListBinding; +import de.dennisguse.opentracks.publicapi.DataProvider; import de.dennisguse.opentracks.sensors.GpsStatusValue; import de.dennisguse.opentracks.services.MissingPermissionException; import de.dennisguse.opentracks.services.RecordingStatus; @@ -62,7 +63,6 @@ import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragm import de.dennisguse.opentracks.ui.markers.MarkerListActivity; import de.dennisguse.opentracks.ui.util.ActivityUtils; import de.dennisguse.opentracks.ui.util.RecyclerViewSwipeDeleteCallback; -import de.dennisguse.opentracks.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.PermissionRequester; @@ -367,7 +367,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co } if (itemId == R.id.list_context_menu_show_on_map) { - IntentDashboardUtils.showTrackOnMap(this, false, trackIds); + DataProvider.showTrackOnMap(this, false, trackIds); return true; } diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java index c134f9e2b..7c5e83781 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java @@ -37,6 +37,7 @@ import de.dennisguse.opentracks.data.TrackDataHub; import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.databinding.TrackRecordedBinding; import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment; +import de.dennisguse.opentracks.publicapi.DataProvider; import de.dennisguse.opentracks.services.RecordingStatus; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; @@ -45,7 +46,6 @@ import de.dennisguse.opentracks.share.ShareUtils; import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.ui.intervals.IntervalsFragment; import de.dennisguse.opentracks.ui.markers.MarkerListActivity; -import de.dennisguse.opentracks.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; /** @@ -167,7 +167,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement } if (item.getItemId() == R.id.track_detail_menu_show_on_map) { - IntentDashboardUtils.showTrackOnMap(this, false, trackId); + DataProvider.showTrackOnMap(this, false, trackId); return true; } diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 44600240c..d0e56ff4d 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -38,6 +38,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.databinding.TrackRecordingBinding; import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment; import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment; +import de.dennisguse.opentracks.publicapi.DataProvider; import de.dennisguse.opentracks.sensors.GpsStatusValue; import de.dennisguse.opentracks.services.RecordingStatus; import de.dennisguse.opentracks.services.TrackRecordingService; @@ -49,7 +50,6 @@ import de.dennisguse.opentracks.ui.intervals.IntervalsFragment; import de.dennisguse.opentracks.ui.markers.MarkerEditActivity; import de.dennisguse.opentracks.ui.markers.MarkerListActivity; import de.dennisguse.opentracks.ui.util.ActivityUtils; -import de.dennisguse.opentracks.util.IntentDashboardUtils; import de.dennisguse.opentracks.util.IntentUtils; /** @@ -267,7 +267,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.track_detail_menu_show_on_map) { - IntentDashboardUtils.showTrackOnMap(this, true, trackId); + DataProvider.showTrackOnMap(this, true, trackId); return true; } diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java b/src/main/java/de/dennisguse/opentracks/publicapi/DataProvider.java similarity index 95% rename from src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java rename to src/main/java/de/dennisguse/opentracks/publicapi/DataProvider.java index 70236e3d0..8716a26ad 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentDashboardUtils.java +++ b/src/main/java/de/dennisguse/opentracks/publicapi/DataProvider.java @@ -1,4 +1,4 @@ -package de.dennisguse.opentracks.util; +package de.dennisguse.opentracks.publicapi; import android.content.ActivityNotFoundException; import android.content.ClipData; @@ -24,10 +24,9 @@ import de.dennisguse.opentracks.settings.PreferencesUtils; * Create an {@link Intent} to request showing tracks on a Map or a Dashboard. * The receiving {@link android.app.Activity} gets temporary access to the {@link TracksColumns} and the {@link TrackPointsColumns} (incl. update). */ -//TODO Add a test for the table structure exposed via the DashboardAPI. -public class IntentDashboardUtils { +public class DataProvider { - private static final String TAG = IntentDashboardUtils.class.getSimpleName(); + private static final String TAG = DataProvider.class.getSimpleName(); private static final String ACTION_DASHBOARD = "Intent.OpenTracks-Dashboard"; @@ -55,7 +54,7 @@ public class IntentDashboardUtils { private static final int MARKERS_URI_INDEX = 2; private static final int NONE_SELECTED = -1; - private IntentDashboardUtils() { + private DataProvider() { } /** diff --git a/src/main/java/de/dennisguse/opentracks/publicapi/StartRecording.java b/src/main/java/de/dennisguse/opentracks/publicapi/StartRecording.java index 949bc2421..582827043 100644 --- a/src/main/java/de/dennisguse/opentracks/publicapi/StartRecording.java +++ b/src/main/java/de/dennisguse/opentracks/publicapi/StartRecording.java @@ -10,7 +10,6 @@ import de.dennisguse.opentracks.data.models.Track; import de.dennisguse.opentracks.data.models.TrackBuilder; import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.settings.PreferencesUtils; -import de.dennisguse.opentracks.util.IntentDashboardUtils; public class StartRecording extends AbstractAPIActivity { @@ -61,7 +60,7 @@ public class StartRecording extends AbstractAPIActivity { String targetPackage = bundle.getString(EXTRA_STATS_TARGET_PACKAGE, null); String targetClass = bundle.getString(EXTRA_STATS_TARGET_CLASS, null); if (targetClass != null && targetPackage != null) { - IntentDashboardUtils.startDashboard(this, true, targetPackage, targetClass, trackId); + DataProvider.startDashboard(this, true, targetPackage, targetClass, trackId); } }