From 77479efaef2f898cdcb1bfc1de794642f4164e8b Mon Sep 17 00:00:00 2001
From: Rodrigo Damazio <Rodrigo Damazio@localhost>
Date: Sat, 20 Nov 2010 05:43:09 -0800
Subject: [PATCH] Fixing TTS initialization.

---
 .../android/apps/mytracks/services/SignalStrengthTask.java    | 4 +++-
 .../android/apps/mytracks/services/StatusAnnouncerTask.java   | 3 +++
 .../android/apps/mytracks/services/TaskExecuterManager.java   | 3 ++-
 .../android/apps/mytracks/services/TrackRecordingService.java | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/SignalStrengthTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/SignalStrengthTask.java
index 379759bb0..3d6017f74 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/SignalStrengthTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/SignalStrengthTask.java
@@ -44,7 +44,8 @@ public class SignalStrengthTask extends PhoneStateListener
   public SignalStrengthTask(Context c) {
     context = c;
   }
-  
+
+  @Override
   public void start() {
     manager =
       (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
@@ -176,6 +177,7 @@ public class SignalStrengthTask extends PhoneStateListener
     }
   }
 
+  @Override
   public void shutdown() {
     if (manager != null) {
       manager.listen(this, PhoneStateListener.LISTEN_NONE);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java
index 9ee8b6c72..60154ba8e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java
@@ -218,6 +218,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
 
   @Override
   public void start() {
+    Log.i(MyTracksConstants.TAG, "Starting TTS");
     if (tts == null) {
       // We can't have this class also be the listener, otherwise it's unsafe to
       // reference it in Cupcake (even if we don't instantiate it).
@@ -243,6 +244,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
       tts.shutdown();
       tts = null;
     }
+
+    Log.i(MyTracksConstants.TAG, "TTS shut down");
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TaskExecuterManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/TaskExecuterManager.java
index 432d0ddab..72ce257ff 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TaskExecuterManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TaskExecuterManager.java
@@ -49,7 +49,8 @@ public class TaskExecuterManager {
    */
   public void setFrequency(int frequency, TrackRecordingService service) {
     this.frequency = frequency;
-    Log.i(MyTracksConstants.TAG, "Frequency set to: " + frequency);
+    Log.i(MyTracksConstants.TAG, "Frequency set to " + frequency
+        + " for task " + task.getClass().getSimpleName());
 
     if (frequency == -1) {
       if (executer != null) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 4b7adc9de..a7b260520 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -679,6 +679,9 @@ public class TrackRecordingService extends Service implements LocationListener {
             if (announcer == null) {
               return;
             }
+
+            // TODO: Either use TaskExecuterManager everywhere, or get rid of it
+            announcer.start();
             announcementExecuter = new PeriodicTaskExecuter(announcer,
                 TrackRecordingService.this);
           }