Use a subscription model for GeoDirHandler

1 files changed, 4 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/speech/SpeechService.java b/main/src/cgeo/geocaching/speech/SpeechService.java
index b13218c..086227d 100644
--- a/main/src/cgeo/geocaching/speech/SpeechService.java
+++ b/main/src/cgeo/geocaching/speech/SpeechService.java
@@ -17,6 +17,7 @@ import android.os.IBinder;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.Engine;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import rx.Subscription;
 
 import java.util.Locale;
 
@@ -75,6 +76,7 @@ public class SpeechService extends Service implements OnInitListener {
     private long lastSpeechTime = 0;
     private float lastSpeechDistance = 0.0f;
     private Geopoint target;
+    private Subscription initSubscription;
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -106,7 +108,7 @@ public class SpeechService extends Service implements OnInitListener {
 
     @Override
     public void onDestroy() {
-        geoDirHandler.stop();
+        initSubscription.unsubscribe();
         if (tts != null) {
             tts.stop();
             tts.shutdown();
@@ -141,7 +143,7 @@ public class SpeechService extends Service implements OnInitListener {
 
         initialized = true;
 
-        geoDirHandler.start();
+        initSubscription = geoDirHandler.start();
     }
 
     @Override