From 7c1995c67f469cc3121b2b8365466c3cae5cbfb0 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Thu, 8 Dec 2022 20:07:26 +0100
Subject: [PATCH] Bugfix: NPE; introduced in
 b53ef455a6415f16054c3fb44369dc5d6f0ee74f

Fixes #1431.
---
 .../viewmodels/GenericStatisticsViewHolder.java     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
index 050d802fa..7dcb6099b 100644
--- a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
+++ b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
@@ -266,20 +266,17 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             SensorDataSet sensorDataSet = data.getSensorDataSet();
             String sensorName = getContext().getString(R.string.value_unknown);
 
+            //TODO Loads preference every time
+            HeartRateZones zones = PreferencesUtils.getHeartRateZones();
+            int textColor;
+
             Pair<String, String> valueAndUnit;
             if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
                 valueAndUnit = StringUtils.getHeartRateParts(getContext(), sensorDataSet.getHeartRate().first);
                 sensorName = sensorDataSet.getHeartRate().second;
-            } else {
-                valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
-            }
-
-            //TODO Loads preference every time
-            HeartRateZones zones = PreferencesUtils.getHeartRateZones();
-            int textColor;
-            if (sensorDataSet != null) {
                 textColor = zones.getColorForZone(sensorDataSet.getHeartRate().first);
             } else {
+                valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
                 textColor = zones.getColorForZone(null);
             }