Addressing review suggestions and adding tests.

MyTracks/src/com/google/android/apps/mytracks/services/SignalStrengthTaskFactory.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.services;
+
+import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.util.ApiFeatures;
+
+import android.content.Context;
+import android.util.Log;
+
+/**
+ * Factory for producing a proper {@link SignalStrengthTask} according to the
+ * current API level.
+ *
+ * @author Rodrigo Damazio
+ */
+public class SignalStrengthTaskFactory {
+  private final boolean hasModernSignalStrength;
+
+  SignalStrengthTaskFactory(ApiFeatures apiFeatures) {
+    this.hasModernSignalStrength = apiFeatures.hasModernSignalStrength();
+  }
+
+  public PeriodicTask create(Context context) {
+    if (hasModernSignalStrength) {
+      Log.d(MyTracksConstants.TAG,
+          "TrackRecordingService using modern signal strength api.");
+      return new SignalStrengthTaskModern(context);
+    } else {
+      Log.w(MyTracksConstants.TAG,
+          "TrackRecordingService using legacy signal strength api.");
+      return new SignalStrengthTask(context);
+    }
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerFactory.java

@@ -28,13 +28,19 @@ import android.media.AudioManager;
  */
 public class StatusAnnouncerFactory {
 
+  private final boolean hasTts;
+
+  public StatusAnnouncerFactory(ApiFeatures apiFeatures) {
+    this.hasTts = apiFeatures.hasTextToSpeech();
+  }
+
   /**
    * Creates a periodic task which does voice announcements.
    *
    * @return the task, or null if announcements are not supported
    */
-  public static PeriodicTask create(Context context) {
-    if (ApiFeatures.hasTextToSpeech()) {
+  public PeriodicTask create(Context context) {
+    if (hasTts) {
       return new StatusAnnouncerTask(context);
     } else {
       return null;
@@ -45,13 +51,11 @@ public class StatusAnnouncerFactory {
    * Returns the appropriate volume stream for controlling announcement
    * volume.
    */
-  public static int getVolumeStream() {
-    if (ApiFeatures.hasTextToSpeech()) {
+  public int getVolumeStream() {
+    if (hasTts) {
       return StatusAnnouncerTask.getVolumeStream();
     } else {
       return AudioManager.USE_DEFAULT_STREAM_TYPE;
     }
   }
-
-  private StatusAnnouncerFactory() {}
 }

MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.java

@@ -83,7 +83,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
   /**
    * Called when the TTS engine is initialized.
    */
-  public void onTtsInit(int status) {
+  private void onTtsInit(int status) {
     Log.i(MyTracksConstants.TAG, "TrackRecordingService.TTS init: " + status);
     this.ready = (status == TextToSpeech.SUCCESS);
 

MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java

@@ -635,17 +635,10 @@ public class TrackRecordingService extends Service implements LocationListener {
     locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
     splitManager = new SplitManager(this);
 
-    PeriodicTask signalStrengthTask;
-    if (ApiFeatures.hasModernSignalStrength()) {
-      Log.d(MyTracksConstants.TAG,
-          "TrackRecordingService using modern signal strength api.");
-      signalStrengthTask = new SignalStrengthTaskModern(this);
-    } else {
-      Log.w(MyTracksConstants.TAG,
-          "TrackRecordingService using legacy signal strength api.");
-      signalStrengthTask = new SignalStrengthTask(this);
-    }
-    signalManager = new TaskExecuterManager(-1, signalStrengthTask, this);
+    SignalStrengthTaskFactory strengthTaskFactory =
+        new SignalStrengthTaskFactory(ApiFeatures.getInstance());
+    signalManager =
+        new TaskExecuterManager(-1, strengthTaskFactory.create(this), this);
 
     prefManager = new PreferenceManager(this);
     prefManager.onSharedPreferenceChanged(null);
@@ -666,7 +659,7 @@ public class TrackRecordingService extends Service implements LocationListener {
     }
     showNotification();
   }
-  
+
   /**
    * Creates an {@link Executer} and schedules {@class SafeStatusAnnouncerTask}.
    * The announcer requires a TTS service and user should have enabled
@@ -675,7 +668,9 @@ public class TrackRecordingService extends Service implements LocationListener {
   private void setUpAnnouncer() {
     if (announcementFrequency != -1) {
       if (announcementExecuter == null) {
-        PeriodicTask announcer = StatusAnnouncerFactory.create(this);
+        StatusAnnouncerFactory statusAnnouncerFactory =
+            new StatusAnnouncerFactory(ApiFeatures.getInstance());
+        PeriodicTask announcer = statusAnnouncerFactory.create(this);
         if (announcer == null) return;
 
         announcementExecuter = new PeriodicTaskExecuter(announcer, this);