karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Interval Stats: track's id it's not long anymore.

Browse Source
This commit is contained in:
Román
2020-08-23 18:22:39 +02:00
committed by Román Martínez
parent d56f652d0a
commit 287d246777
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class IntervalStatisticsTest {
private static final String TAG = IntervalStatisticsTest.class.getSimpleName(); private static final String TAG = IntervalStatisticsTest.class.getSimpleName();
private List<TrackPoint> buildTrackPoints(int numberOfTrackPoints) { private List<TrackPoint> buildTrackPoints(int numberOfTrackPoints) {
Pair<Track, TrackPoint[]> pair = TestDataUtil.createTrack(System.currentTimeMillis(), numberOfTrackPoints); Pair<Track, TrackPoint[]> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints);
List<TrackPoint> trackPoints = Arrays.asList(pair.second); List<TrackPoint> trackPoints = Arrays.asList(pair.second);
return trackPoints; return trackPoints;
src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordingFragment.java
+2 -1
View File
@@ -14,6 +14,7 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.Track;
import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.PreferencesUtils;
import de.dennisguse.opentracks.util.UnitConversions; import de.dennisguse.opentracks.util.UnitConversions;
import de.dennisguse.opentracks.viewmodels.IntervalStatistics; import de.dennisguse.opentracks.viewmodels.IntervalStatistics;
@@ -109,7 +110,7 @@ public class IntervalsRecordingFragment extends Fragment implements IntervalList
return; return;
} }
long trackId = PreferencesUtils.getRecordingTrackId(getContext()); Track.Id trackId = PreferencesUtils.getRecordingTrackId(getContext());
viewModel.invalidate(); viewModel.invalidate();
LiveData<IntervalStatistics> liveData; LiveData<IntervalStatistics> liveData;
if (interval == null) { if (interval == null) {
src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
+4 -3
View File
@@ -10,6 +10,7 @@ import androidx.lifecycle.MutableLiveData;
import java.util.List; import java.util.List;
import de.dennisguse.opentracks.content.data.Track;
import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.content.data.TrackPoint;
import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -29,7 +30,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
interval = IntervalOption.OPTION_1; interval = IntervalOption.OPTION_1;
} }
public LiveData<IntervalStatistics> getIntervalStats(long trackId, IntervalOption interval) { public LiveData<IntervalStatistics> getIntervalStats(Track.Id trackId, IntervalOption interval) {
if (intervalStats == null || this.interval != interval) { if (intervalStats == null || this.interval != interval) {
intervalStats = new MutableLiveData<>(); intervalStats = new MutableLiveData<>();
this.interval = interval; this.interval = interval;
@@ -38,7 +39,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
return intervalStats; return intervalStats;
} }
public LiveData<IntervalStatistics> getIntervalStats(long trackId) { public LiveData<IntervalStatistics> getIntervalStats(Track.Id trackId) {
return getIntervalStats(trackId, interval); return getIntervalStats(trackId, interval);
} }
@@ -49,7 +50,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
intervalStats = null; intervalStats = null;
} }
private void loadIntervalStats(long trackId) { private void loadIntervalStats(Track.Id trackId) {
new Thread(() -> { new Thread(() -> {
Context context = getApplication().getApplicationContext(); Context context = getApplication().getApplicationContext();
ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context); ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);