From 48abfdd621f5cb1f4ff5d99cc353e170578ad97d Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 10 Oct 2011 18:11:51 -0700
Subject: [PATCH] Fix SignalStrengthSampler. Fix style comment on
 TrackRecordingService.

---
 .../mytracks/services/TrackRecordingService.java     |  5 +++--
 .../signalstrength/RecordingStateReceiver.java       |  6 ++----
 .../test/RecordingStateReceiverTest.java             | 12 ------------
 3 files changed, 5 insertions(+), 18 deletions(-)

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 83ce06e1d..b9d31a681 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -1045,8 +1045,9 @@ public class TrackRecordingService extends Service {
   }
 
   private void sendTrackBroadcast(int actionResId, long trackId) {
-    Intent broadcastIntent = new Intent().setAction(getString(actionResId)).putExtra(
-        getString(R.string.track_id_broadcast_extra), trackId);
+    Intent broadcastIntent = new Intent()
+        .setAction(getString(actionResId))
+        .putExtra(getString(R.string.track_id_broadcast_extra), trackId);
     sendBroadcast(broadcastIntent, getString(R.string.mytracks_notifications_permission));
     
     SharedPreferences sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
diff --git a/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/RecordingStateReceiver.java b/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/RecordingStateReceiver.java
index 1b57700ac..418fd3545 100644
--- a/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/RecordingStateReceiver.java
+++ b/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/RecordingStateReceiver.java
@@ -34,8 +34,7 @@ public class RecordingStateReceiver extends BroadcastReceiver {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);
 
     String action = intent.getAction();
-    if (ctx.getString(R.string.track_started_broadcast_action).equals(action) ||
-        ctx.getString(R.string.track_resumed_broadcast_action).equals(action)) {
+    if (ctx.getString(R.string.track_started_broadcast_action).equals(action)) {
       boolean autoStart = preferences.getBoolean(
           ctx.getString(R.string.settings_auto_start_key), false);
       if (!autoStart) {
@@ -44,8 +43,7 @@ public class RecordingStateReceiver extends BroadcastReceiver {
       }
 
       startService(ctx);
-    } else if (ctx.getString(R.string.track_stopped_broadcast_action).equals(action) ||
-               ctx.getString(R.string.track_paused_broadcast_action).equals(action)) {
+    } else if (ctx.getString(R.string.track_stopped_broadcast_action).equals(action)) {
       boolean autoStop = preferences.getBoolean(
           ctx.getString(R.string.settings_auto_stop_key), true);
       if (!autoStop) {
diff --git a/SignalStrengthSamplerTest/src/com/google/android/apps/mytracks/signalstrength/test/RecordingStateReceiverTest.java b/SignalStrengthSamplerTest/src/com/google/android/apps/mytracks/signalstrength/test/RecordingStateReceiverTest.java
index 8f5b6c9cc..55bffec45 100644
--- a/SignalStrengthSamplerTest/src/com/google/android/apps/mytracks/signalstrength/test/RecordingStateReceiverTest.java
+++ b/SignalStrengthSamplerTest/src/com/google/android/apps/mytracks/signalstrength/test/RecordingStateReceiverTest.java
@@ -71,24 +71,12 @@ public class RecordingStateReceiverTest extends AndroidTestCase {
     assertServiceCalls(1, 0);
   }
 
-  public void testOnReceive_resume() {
-    receiver.onReceive(context,
-        new Intent(context.getString(R.string.track_resumed_broadcast_action)));
-    assertServiceCalls(1, 0);
-  }
-
   public void testOnReceive_stop() {
     receiver.onReceive(context,
         new Intent(context.getString(R.string.track_stopped_broadcast_action)));
     assertServiceCalls(0, 1);
   }
 
-  public void testOnReceive_pause() {
-    receiver.onReceive(context,
-        new Intent(context.getString(R.string.track_paused_broadcast_action)));
-    assertServiceCalls(0, 1);
-  }
-
   public void testOnReceive_noAutoStart() {
     preferences
         .edit()