From 9994cfd260363969367ae1a5f3ddc45ebd08ac49 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 7 Dec 2019 13:37:06 +0100
Subject: [PATCH] Bugfix: NPE.

---
 .../de/dennisguse/opentracks/fragments/StatsFragment.java    | 5 ++++-
 .../opentracks/services/TrackRecordingServiceConnection.java | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
index 527ed0503..c6a3d8751 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
@@ -68,6 +68,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     private TrackDataHub trackDataHub;
     private Handler handlerUpdateUI;
 
+    //TODO Initialize immediately and remove in onDestroy()
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
 
     private Location lastLocation = null;
@@ -237,7 +238,9 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     @Override
     public void onStop() {
         super.onStop();
-        trackRecordingServiceConnection.unbind();
+        if (trackRecordingServiceConnection != null) {
+            trackRecordingServiceConnection.unbind();
+        }
         trackRecordingServiceConnection = null;
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
index 90d219407..d4aed18a2 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
@@ -48,6 +48,8 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
 
     private static final String TAG = TrackRecordingServiceConnection.class.getSimpleName();
 
+    @Deprecated
+    //TODO Always the context of the owner of a service connection (i.e., let it be passed to every call).
     private final Context context;
     private final Runnable callback;