upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 17:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Interval Stats: fixed NPE introduced in 25ef0ecad1.

Browse Source 
Includes some refactoring.
This commit is contained in:
Dennis Guse
2020-09-02 23:12:52 +02:00
parent 951671b2f3
commit 24e6cdec62
7 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
+7 -8
View File
@@ -4,6 +4,7 @@ import android.app.Application;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
@@ -22,17 +23,15 @@ import de.dennisguse.opentracks.util.UnitConversions;
*/
public class IntervalStatisticsModel extends AndroidViewModel {
private MutableLiveData<IntervalStatistics> intervalStats;
private IntervalOption interval;
private MutableLiveData<IntervalStatistics> intervalStats = new MutableLiveData<>();
private IntervalOption interval = IntervalOption.OPTION_1;
public IntervalStatisticsModel(@NonNull Application application) {
super(application);
interval = IntervalOption.OPTION_1;
}
public LiveData<IntervalStatistics> getIntervalStats(Track.Id trackId, IntervalOption interval) {
if (intervalStats == null || this.interval != interval) {
intervalStats = new MutableLiveData<>();
public LiveData<IntervalStatistics> getIntervalStats(@Nullable Track.Id trackId, IntervalOption interval) {
if (trackId != null && this.interval != interval) {
this.interval = interval;
loadIntervalStats(trackId);
}
@@ -47,10 +46,10 @@ public class IntervalStatisticsModel extends AndroidViewModel {
* Call this method when you want to force the view model to re-load intervals.
*/
public void invalidate() {
intervalStats = null;
intervalStats = new MutableLiveData<>();
}
private void loadIntervalStats(Track.Id trackId) {
private void loadIntervalStats(final Track.Id trackId) {
new Thread(() -> {
Context context = getApplication().getApplicationContext();
ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);