From 470f23afa8210d020c5bdf2a0f02fff6c545bfa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rom=C3=A1n=20Mart=C3=ADnez?= <rgmf@riseup.net>
Date: Wed, 16 Jun 2021 16:26:44 +0200
Subject: [PATCH] Bugfix: pace or speed header text is not showing in
 intervals. Bugfix: viewModel checking onPause.

---
 .../dennisguse/opentracks/fragments/IntervalsFragment.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java
index 27db82638..2980cec7d 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/IntervalsFragment.java
@@ -154,7 +154,9 @@ public class IntervalsFragment extends Fragment {
     public void onPause() {
         super.onPause();
         sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        viewModel.onPause();
+        if (viewModel != null) {
+            viewModel.onPause();
+        }
     }
 
     @Override
@@ -180,6 +182,7 @@ public class IntervalsFragment extends Fragment {
         if (viewModel == null) {
             return;
         }
+        viewBinding.intervalRate.setText(isReportSpeed ? getString(R.string.stats_speed) : getString(R.string.stats_pace));
         LiveData<List<IntervalStatistics.Interval>> liveData = viewModel.getIntervalStats(trackId, metricUnits, selectedInterval);
         liveData.observe(getActivity(), intervalList -> adapter.swapData(intervalList, metricUnits, isReportSpeed));
     }