Moving signal strength sampling into a separate app.

MyTracks/src/com/google/android/apps/mytracks/content/Waypoint.java

@@ -49,7 +49,10 @@ public final class Waypoint implements Parcelable {
       waypoint.type = source.readInt();
       waypoint.startId = source.readLong();
       waypoint.stopId = source.readLong();
-      waypoint.stats = source.readParcelable(classLoader);
+      byte hasStats = source.readByte();
+      if (hasStats > 0) {
+        waypoint.stats = source.readParcelable(classLoader);
+      }
       byte hasLocation = source.readByte();
       if (hasLocation > 0) {
         waypoint.location = source.readParcelable(classLoader);
@@ -100,7 +103,10 @@ public final class Waypoint implements Parcelable {
     dest.writeInt(type);
     dest.writeLong(startId);
     dest.writeLong(stopId);
-    dest.writeParcelable(stats, 0);
+    dest.writeByte(stats == null ? (byte) 0 : (byte) 1);
+    if (stats != null) {
+      dest.writeParcelable(stats, 0);
+    }
     dest.writeByte(location == null ? (byte) 0 : (byte) 1);
     if (location != null) {
       dest.writeParcelable(location, 0);

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

@@ -40,7 +40,6 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
   private final String minRecordingIntervalKey;
   private final String minRequiredAccuracyKey;
   private final String recordingTrackKey;
-  private final String signalSamplingFrequencyKey;
   private final String splitFrequencyKey;
 
   public PreferenceManager(TrackRecordingService service) {
@@ -72,8 +71,6 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
         service.getString(R.string.min_required_accuracy_key);
     recordingTrackKey =
         service.getString(R.string.recording_track_key);
-    signalSamplingFrequencyKey =
-        service.getString(R.string.signal_sampling_frequency_key);
     splitFrequencyKey =
         service.getString(R.string.split_frequency_key);
     
@@ -163,10 +160,6 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
       service.getSplitManager().setSplitFrequency(
           sharedPreferences.getInt(splitFrequencyKey, 0));
     }
-    if (key == null || key.equals(signalSamplingFrequencyKey)) {
-      service.getSignalManager().setFrequency(
-          sharedPreferences.getInt(signalSamplingFrequencyKey, -1), service);
-    }
     if (key == null || key.equals(metricUnitsKey)) {
       service.getSplitManager().setMetricUnits(
           sharedPreferences.getBoolean(metricUnitsKey, true));

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

@@ -1,195 +0,0 @@
-/*
- * 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.content.Waypoint;
-
-import android.content.Context;
-import android.location.Location;
-import android.telephony.CellLocation;
-import android.telephony.NeighboringCellInfo;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * A class to monitor the network signal strength.
- *
- * @author Sandor Dornbush
- */
-public class SignalStrengthTask extends PhoneStateListener
-    implements PeriodicTask {
-
-  private final Context context;
-  private TelephonyManager manager;
-  private int signalStrength = -1;
-
-  public SignalStrengthTask(Context c) {
-    context = c;
-  }
-
-  @Override
-  public void start() {
-    manager =
-      (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-    if (manager == null) {
-      Log.e(MyTracksConstants.TAG, "Cannot get telephony manager.");
-    } else {
-      manager.listen(this, getListenEvents());
-    }
-  }
-
-  protected int getListenEvents() {
-    return PhoneStateListener.LISTEN_SIGNAL_STRENGTHS;
-  }
-
-  @Override
-  public void onSignalStrengthChanged(int asu) {
-    this.signalStrength = asu;
-    Log.d(MyTracksConstants.TAG, "Signal Strength: " + signalStrength);
-  }
-
-  @Override
-  public void run(TrackRecordingService service) {
-    Log.d(MyTracksConstants.TAG, "Adding signal marker");
-    Location location = service.getLastLocation();
-    if (manager == null) {
-      Log.d(MyTracksConstants.TAG, "Adding signal marker: marker null");
-      return;
-    }
-    if (location == null) {
-      Log.d(MyTracksConstants.TAG, "Adding signal marker: location null");
-      return;
-    }
-    Waypoint wpt = new Waypoint();
-    wpt.setName("Signal Strength");
-    wpt.setType(Waypoint.TYPE_WAYPOINT);
-    wpt.setTrackId(service.getRecordingTrackId());
-    int networkType = manager.getNetworkType();
-    wpt.setIcon(getIcon(networkType));
-    wpt.setLocation(location);
-    wpt.setDescription(getDescription());
-    long waypointId = service.insertWaypointMarker(wpt);
-    if (waypointId >= 0) {
-      Log.d(MyTracksConstants.TAG, "Added signal marker");
-    } else {
-      Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker?");
-    }
-  }
-
-  /**
-   * Gets a human readable description for the network type.
-   *
-   * @param type The integer constant for the network type
-   * @return A human readable description of the network type
-   */
-  protected String getTypeAsString(int type) {
-    switch (type) {
-      case TelephonyManager.NETWORK_TYPE_EDGE:
-        return "EDGE";
-      case TelephonyManager.NETWORK_TYPE_GPRS:
-        return "GPRS";
-      case TelephonyManager.NETWORK_TYPE_UMTS:
-        return "UMTS";
-      case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-      default:
-        return "UNKNOWN";
-    }
-  }
-
-  /**
-   * Builds a description for the current signal strength.
-   * 
-   * @return A human readable description of the network state
-   */
-  private String getDescription() {
-    StringBuffer sb = new StringBuffer();
-    sb.append(getStrengthAsString());
-
-    sb.append("Network Type: ");
-    sb.append(getTypeAsString(manager.getNetworkType()));
-    sb.append('\n');
-
-    sb.append("Operator: ");
-    sb.append(manager.getNetworkOperatorName());
-    sb.append(" / ");
-    sb.append(manager.getNetworkOperator());
-    sb.append('\n');
-
-    sb.append("Roaming: ");
-    sb.append(manager.isNetworkRoaming());
-    sb.append('\n');
-
-    List<NeighboringCellInfo> infos = manager.getNeighboringCellInfo();
-    Log.i(MyTracksConstants.TAG, "Found " + infos.size() + " cells.");
-    if (infos.size() > 0) {
-      sb.append("Neighbors: ");
-      for (NeighboringCellInfo info : infos) {
-        sb.append(info.toString());
-        sb.append(' ');
-      }
-      sb.append('\n');
-    }
-
-    CellLocation cell = manager.getCellLocation();
-    if (cell != null) {
-      sb.append("Cell: ");
-      sb.append(cell.toString());
-      sb.append('\n');
-    }
-
-    return sb.toString();
-  }
-
-  /**
-   * Gets the url for the waypoint icon for the current network type.
-   *
-   * @param type The network type
-   * @return A url to a image to use as the waypoint icon
-   */
-  protected String getIcon(int type) {
-    switch (type) {
-      case TelephonyManager.NETWORK_TYPE_GPRS:
-      case TelephonyManager.NETWORK_TYPE_EDGE:
-        return "http://maps.google.com/mapfiles/ms/micons/green.png";
-      case TelephonyManager.NETWORK_TYPE_UMTS:
-        return "http://maps.google.com/mapfiles/ms/micons/blue.png";
-      case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-      default:
-        return "http://maps.google.com/mapfiles/ms/micons/red.png";
-    }
-  }
-
-  @Override
-  public void shutdown() {
-    if (manager != null) {
-      manager.listen(this, PhoneStateListener.LISTEN_NONE);
-      manager = null;
-    }
-  }
-
-  public String getStrengthAsString() {
-    return "Strength: " + signalStrength + "\n";
-  }
-
-  protected Context getContext() {
-    return context;
-  }
-}

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

@@ -1,48 +0,0 @@
-/*
- * 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/SignalStrengthTaskModern.java

@@ -1,155 +0,0 @@
-/*
- * 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.maps.mytracks.R;
-
-import android.content.Context;
-import android.telephony.PhoneStateListener;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-/**
- * A class to monitor the network signal strength.
- *
- * @author Sandor Dornbush
- */
-public class SignalStrengthTaskModern extends SignalStrengthTask {
-
-  private SignalStrength signalStrength = null;
-
-  public SignalStrengthTaskModern(Context c) {
-    super(c);
-  }
-
-  @Override
-  protected int getListenEvents() {
-    return PhoneStateListener.LISTEN_SIGNAL_STRENGTHS;
-  }
-
-  /**
-   * Gets a human readable description for the network type.
-   *
-   * @param type The integer constant for the network type
-   * @return A human readable description of the network type
-   */
-  @Override
-  protected String getTypeAsString(int type) {
-    switch (type) {
-      case TelephonyManager.NETWORK_TYPE_1xRTT:
-        return "1xRTT";
-      case TelephonyManager.NETWORK_TYPE_CDMA:
-        return "CDMA";
-      case TelephonyManager.NETWORK_TYPE_EDGE:
-        return "EDGE";
-      case TelephonyManager.NETWORK_TYPE_EVDO_0:
-        return "EVDO 0";
-      case TelephonyManager.NETWORK_TYPE_EVDO_A:
-        return "EVDO A";
-      case TelephonyManager.NETWORK_TYPE_GPRS:
-        return "GPRS";
-      case TelephonyManager.NETWORK_TYPE_HSDPA:
-        return "HSDPA";
-      case TelephonyManager.NETWORK_TYPE_HSPA:
-        return "HSPA";
-      case TelephonyManager.NETWORK_TYPE_HSUPA:
-        return "HSUPA";
-      case TelephonyManager.NETWORK_TYPE_UMTS:
-        return "UMTS";
-      case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-      default:
-        return "UNKNOWN";
-    }
-  }
-
-  /**
-   * Gets the url for the waypoint icon for the current network type.
-   *
-   * @param type The network type
-   * @return A url to a image to use as the waypoint icon
-   */
-  @Override
-  protected String getIcon(int type) {
-    switch (type) {
-      case TelephonyManager.NETWORK_TYPE_1xRTT:
-      case TelephonyManager.NETWORK_TYPE_CDMA:
-      case TelephonyManager.NETWORK_TYPE_GPRS:
-      case TelephonyManager.NETWORK_TYPE_EDGE:
-        return "http://maps.google.com/mapfiles/ms/micons/green.png";
-      case TelephonyManager.NETWORK_TYPE_EVDO_0:
-      case TelephonyManager.NETWORK_TYPE_EVDO_A:
-      case TelephonyManager.NETWORK_TYPE_HSDPA:
-      case TelephonyManager.NETWORK_TYPE_HSPA:
-      case TelephonyManager.NETWORK_TYPE_HSUPA:
-      case TelephonyManager.NETWORK_TYPE_UMTS:
-        return "http://maps.google.com/mapfiles/ms/micons/blue.png";
-      case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-      default:
-        return "http://maps.google.com/mapfiles/ms/micons/red.png";
-    }
-  }
-
-  @Override
-  public String getStrengthAsString() {
-    if (signalStrength == null) {
-      return "Strength: " + getContext().getString(R.string.unknown) + "\n";
-    }
-    StringBuffer sb = new StringBuffer();
-    if (signalStrength.isGsm()) {
-      appendSignal(signalStrength.getGsmSignalStrength(),
-                   R.string.gsm_strength,
-                   sb);
-      maybeAppendSignal(signalStrength.getGsmBitErrorRate(),
-                        R.string.error_rate,
-                        sb);
-    } else {
-      appendSignal(signalStrength.getCdmaDbm(), R.string.cdma_strength, sb);
-      appendSignal(signalStrength.getCdmaEcio() / 10.0, R.string.ecio, sb);
-      appendSignal(signalStrength.getEvdoDbm(), R.string.evdo_strength, sb);
-      appendSignal(signalStrength.getEvdoEcio() / 10.0, R.string.ecio, sb);
-      appendSignal(signalStrength.getEvdoSnr(),
-                   R.string.signal_to_noise_ratio,
-                   sb);
-    }
-    return sb.toString();
-  }
-
-  private void maybeAppendSignal(
-      int signal, int signalFormat, StringBuffer sb) {
-    if (signal > 0) {
-      sb.append(getContext().getString(signalFormat, signal));
-    }
-  }
-
-  private void appendSignal(int signal, int signalFormat, StringBuffer sb) {
-    sb.append(getContext().getString(signalFormat, signal));
-    sb.append("\n");
-  }
-
-  private void appendSignal(double signal, int signalFormat, StringBuffer sb) {
-    sb.append(getContext().getString(signalFormat, signal));
-    sb.append("\n");
-  }
-
-  @Override
-  public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-    Log.d(MyTracksConstants.TAG, "Signal Strength Modern: " + signalStrength);
-    this.signalStrength = signalStrength;
-  }
-}

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

@@ -123,7 +123,6 @@ public class TrackRecordingService extends Service implements LocationListener {
    * Status announcer executer.
    */
   private PeriodicTaskExecuter announcementExecuter;
-  private TaskExecuterManager signalManager;
   private SplitManager splitManager;
 
   private PreferenceManager prefManager;
@@ -425,7 +424,6 @@ public class TrackRecordingService extends Service implements LocationListener {
     statsBuilder = new TripStatisticsBuilder(stats.getStartTime());
     setUpAnnouncer();
 
-    signalManager.restore();
     splitManager.restore();
     length = 0;
     lastValidLocation = null;
@@ -643,11 +641,6 @@ public class TrackRecordingService extends Service implements LocationListener {
     locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
     splitManager = new SplitManager(this);
 
-    SignalStrengthTaskFactory strengthTaskFactory =
-        new SignalStrengthTaskFactory(ApiFeatures.getInstance());
-    signalManager =
-        new TaskExecuterManager(-1, strengthTaskFactory.create(this), this);
-
     prefManager = new PreferenceManager(this);
     registerLocationListener();
     /**
@@ -730,8 +723,6 @@ public class TrackRecordingService extends Service implements LocationListener {
     timer.purge();
     unregisterLocationListener();
     shutdownAnnouncer();
-    signalManager.shutdown();
-    signalManager = null;
     splitManager.shutdown();
     splitManager = null;
 
@@ -863,15 +854,25 @@ public class TrackRecordingService extends Service implements LocationListener {
       throw new IllegalStateException(
           "Unable to insert waypoint marker while not recording!");
     }
-    
-    if (waypoint.getLocation() != null) {
-      waypoint.setLength(length);
-      waypoint.setDuration(waypoint.getLocation().getTime()
-          - statsBuilder.getStatistics().getStartTime());
-      Uri uri = providerUtils.insertWaypoint(waypoint);
-      return Long.parseLong(uri.getLastPathSegment());
+
+    if (waypoint.getLocation() == null) {
+      if (lastValidLocation == null) {
+        Log.w(MyTracksConstants.TAG, "Cannot insert waypoint with no location");
+        return -1;
+      }
+
+      waypoint.setLocation(lastValidLocation);
     }
-    return -1;
+
+    if (waypoint.getTrackId() < 0) {
+      waypoint.setTrackId(recordingTrackId);
+    }
+
+    waypoint.setLength(length);
+    waypoint.setDuration(waypoint.getLocation().getTime()
+        - statsBuilder.getStatistics().getStartTime());
+    Uri uri = providerUtils.insertWaypoint(waypoint);
+    return Long.parseLong(uri.getLastPathSegment());
   }
 
   /**
@@ -1041,7 +1042,6 @@ public class TrackRecordingService extends Service implements LocationListener {
     showNotification();
     registerLocationListener();
     splitManager.restore();
-    signalManager.restore();
 
     // Reset the number of auto-resume retries.
     setAutoResumeTrackRetries(
@@ -1168,8 +1168,4 @@ public class TrackRecordingService extends Service implements LocationListener {
   public SplitManager getSplitManager() {
     return splitManager;
   }
-
-  public TaskExecuterManager getSignalManager() {
-    return signalManager;
-  }
 }

MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java

@@ -107,10 +107,6 @@ public class ApiFeatures {
 
     return true;
   }
-
-  public boolean hasModernSignalStrength() {
-    return getApiLevel() >= 7;
-  }
   
   // Visible for testing.
   protected int getApiLevel() {