Move data classes into separate package.

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

@@ -19,7 +19,7 @@ package de.dennisguse.opentracks;
 import android.location.Location;
 
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 /**

src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java

@@ -27,6 +27,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 
 /**
  * Tests {@link CustomContentProvider}.

src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsTest.java

@@ -35,6 +35,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TripStatistics;
 
 import static org.mockito.Mockito.when;

src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java

@@ -27,6 +27,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 

src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java

@@ -36,6 +36,8 @@ import java.util.List;
 
 import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
 import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.TripStatistics;
 
 /**

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java

@@ -33,10 +33,10 @@ import java.util.Locale;
 import java.util.SimpleTimeZone;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.TracksColumns;
-import de.dennisguse.opentracks.content.Waypoint;
-import de.dennisguse.opentracks.content.WaypointsColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java

@@ -27,7 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 import static org.mockito.Mockito.any;

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java

@@ -27,7 +27,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 import static org.mockito.Mockito.any;

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

@@ -44,9 +44,9 @@ import java.util.concurrent.TimeoutException;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.CustomContentProvider;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 

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

@@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.CustomContentProvider;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 

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

@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.fragments.MarkerDetailFragment;
 

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

@@ -26,8 +26,8 @@ import android.widget.Button;
 import android.widget.EditText;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 
 /**

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

@@ -38,8 +38,8 @@ import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.WaypointsColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.util.ActivityUtils;

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

@@ -44,8 +44,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.SearchEngine;
 import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
 import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
 import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;

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

@@ -43,10 +43,10 @@ import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
-import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.fragments.ChartDistanceFragment;
 import de.dennisguse.opentracks.fragments.ChartTimeFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;

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

@@ -31,7 +31,7 @@ import android.widget.Spinner;
 import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.util.TrackIconUtils;

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

@@ -51,7 +51,7 @@ import androidx.loader.content.Loader;
 import java.util.Locale;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.services.ITrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;

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

@@ -41,7 +41,7 @@ import java.util.List;
 
 import de.dennisguse.opentracks.MarkerDetailActivity;
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.stats.ExtremityMonitor;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.MarkerUtils;

src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java

@@ -35,6 +35,11 @@ import java.util.NoSuchElementException;
 import de.dennisguse.opentracks.BuildConfig;
 import de.dennisguse.opentracks.android.ContentResolverWrapper;
 import de.dennisguse.opentracks.android.IContentResolver;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
@@ -50,11 +55,6 @@ public class ContentProviderUtils {
     private static final String TAG = ContentProviderUtils.class.getSimpleName();
     private static final int MAX_LATITUDE = 90000000;
 
-    /**
-     * Maximum number of waypoints that will be loaded at one time.
-     */
-    public static int MAX_LOADED_WAYPOINTS_POINTS = 10000;
-
     /**
      * The authority (the first part of the URI) for the app's content provider.
      */
@@ -63,7 +63,12 @@ public class ContentProviderUtils {
     /**
      * The base URI for the app's content provider.
      */
-    static String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE;
+    public static String CONTENT_BASE_URI = "content://" + AUTHORITY_PACKAGE;
+
+    /**
+     * Maximum number of waypoints that will be loaded at one time.
+     */
+    public static int MAX_LOADED_WAYPOINTS_POINTS = 10000;
 
     private final IContentResolver contentResolver;
     private int defaultCursorBatchSize = 2000;

src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java

@@ -34,6 +34,10 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
+
 /**
  * A {@link ContentProvider} that handles access to track points, tracks, and waypoints tables.
  *

src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java

@@ -25,6 +25,10 @@ import android.util.Log;
 import java.util.EnumSet;
 import java.util.Set;
 
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
+
 /**
  * Creates observers/listeners and manages their registration with {@link DataSource}.
  * The observers/listeners calls {@link DataSourceListener} when data changes.

src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java

@@ -15,6 +15,7 @@
  */
 package de.dennisguse.opentracks.content;
 
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TripStatistics;
 
 /**

src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java

@@ -22,6 +22,7 @@ import android.util.Pair;
 import androidx.annotation.VisibleForTesting;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.UnitConversions;

src/main/java/de/dennisguse/opentracks/content/SearchEngine.java

@@ -28,6 +28,10 @@ import java.util.Locale;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.content.data.WaypointsColumns;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.UnitConversions;

src/main/java/de/dennisguse/opentracks/content/ShareContentProvider.java

@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import de.dennisguse.opentracks.android.IContentResolver;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
 

src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java

@@ -30,6 +30,8 @@ import java.util.EnumSet;
 import java.util.Set;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 

src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java

@@ -18,6 +18,9 @@ package de.dennisguse.opentracks.content;
 
 import android.location.Location;
 
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
+
 /**
  * Listener for track data changes.
  *

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

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.content.data;
 
 import android.location.Location;
 

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

@@ -14,11 +14,13 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.content.data;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
 
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+
 /**
  * Constants for the track points table.
  *

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

@@ -14,11 +14,13 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.content.data;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
 
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+
 /**
  * Constants for the tracks table.
  *

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

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.content.data;
 
 import android.location.Location;
 import android.net.Uri;

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

@@ -14,11 +14,13 @@
  * the License.
  */
 
-package de.dennisguse.opentracks.content;
+package de.dennisguse.opentracks.content.data;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
 
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+
 /**
  * Constants for waypoints table.
  *

src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java

@@ -37,11 +37,11 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
 import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.TrackDataType;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.stats.TripStatisticsUpdater;

src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java

@@ -41,7 +41,7 @@ import androidx.fragment.app.FragmentActivity;
 import de.dennisguse.opentracks.MarkerEditActivity;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.ListItemUtils;
 import de.dennisguse.opentracks.util.MarkerUtils;

src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java

@@ -37,11 +37,11 @@ import java.util.EnumSet;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackDetailActivity;
-import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.TrackDataType;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.ITrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;

src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java

@@ -6,7 +6,7 @@ import java.util.Locale;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.io.file.exporter.FileTrackExporter;
 import de.dennisguse.opentracks.io.file.exporter.GpxTrackWriter;
 import de.dennisguse.opentracks.io.file.exporter.KmlTrackWriter;

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

@@ -28,8 +28,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;

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

@@ -29,8 +29,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.LocationFactory;
 import de.dennisguse.opentracks.content.LocationIterator;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.LocationUtils;
 
 /**

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

@@ -23,8 +23,8 @@ import java.io.PrintWriter;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.StringUtils;
 
 /**

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

@@ -30,8 +30,8 @@ import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.DescriptionGenerator;
 import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.util.StringUtils;
 

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

@@ -32,8 +32,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.util.FileUtils;
 
 /**

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

@@ -19,8 +19,8 @@ import android.location.Location;
 
 import java.io.OutputStream;
 
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 
 /**
  * Interface for writing tracks to a file. The expected sequence of calls is:

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

@@ -41,8 +41,8 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.LocationFactory;
 import de.dennisguse.opentracks.content.LocationIterator;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.stats.TripStatistics;
 import de.dennisguse.opentracks.stats.TripStatisticsUpdater;

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

@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;

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

@@ -47,9 +47,9 @@ import de.dennisguse.opentracks.content.CustomContentProvider;
 import de.dennisguse.opentracks.content.LocationFactory;
 import de.dennisguse.opentracks.content.LocationIterator;
 import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory;

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

@@ -36,8 +36,8 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
 import de.dennisguse.opentracks.content.ShareContentProvider;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.Waypoint;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 
 /**

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

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
-import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.data.Track;
 
 /**
  * Utility class for decimating tracks at a given level of precision.

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

@@ -19,8 +19,8 @@ package de.dennisguse.opentracks.util;
 import android.content.Context;
 
 import de.dennisguse.opentracks.content.ContentProviderUtils;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TracksColumns;
 
 /**
  * Utilities for updating track.