merge heads

MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java

@@ -108,7 +108,7 @@ public class SettingsActivity extends PreferenceActivity {
       announcementFrequency.setEnabled(false);
       announcementFrequency.setValue("-1");
       announcementFrequency.setSummary(
-          R.string.settings_not_available_summary);
+          R.string.settings_announcement_frequency_not_available);
     }
   }
   

MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java

@@ -132,16 +132,16 @@ public class SaveActivity extends Activity {
     // Share the file.
     Intent shareIntent = new Intent(Intent.ACTION_SEND);
     shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-        getResources().getText(R.string.send_track_subject).toString());
+        getResources().getText(R.string.share_track_subject).toString());
     shareIntent.putExtra(Intent.EXTRA_TEXT,
-        getResources().getText(R.string.send_track_body_format)
+        getResources().getText(R.string.share_track_file_body_format)
         .toString());
     shareIntent.setType(format.getMimeType());
     Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
     shareIntent.putExtra(Intent.EXTRA_STREAM, u);
     shareIntent.putExtra(getString(R.string.track_id_broadcast_extra), trackId);
     startActivity(Intent.createChooser(shareIntent,
-        getResources().getText(R.string.share_track).toString()));
+        getResources().getText(R.string.share_track_picker_title).toString()));
   }
 
   private void showResultDialog() {

MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java

@@ -17,6 +17,8 @@ package com.google.android.apps.mytracks.io.file;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
+import com.google.android.apps.mytracks.util.FileUtils;
+
 import android.os.Environment;
 import android.util.Log;
 
@@ -51,11 +53,9 @@ public class TempFileCleaner {
   }
 
   private void cleanTmpDirectory(String name) {
-    String sep = System.getProperty("file.separator");
-    cleanTmpDirectory(
-        new File(
-            Environment.getExternalStorageDirectory() + sep + name + sep
-            + "tmp"));
+    FileUtils fileUtils = new FileUtils();
+    String dirName = fileUtils.buildExternalDirectoryPath(name, "tmp");
+    cleanTmpDirectory(new File(dirName));
   }
 
   // @VisibleForTesting

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java

@@ -81,7 +81,7 @@ public class ResultDialogFactory {
 
     builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
     if (onShareClickListener != null) {
-      builder.setNegativeButton(activity.getString(R.string.share_track),
+      builder.setNegativeButton(activity.getString(R.string.share_track_url),
           onShareClickListener);
     }
 

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java

@@ -692,15 +692,15 @@ public class SendActivity extends Activity implements ProgressIndicator {
     boolean shareUrlOnly = sharedPreferences.getBoolean(
         getString(R.string.share_url_only_key), false);
     String msg = shareUrlOnly ? url : String.format(
-        getResources().getText(R.string.share_map_body_format).toString(), url);
+        getResources().getText(R.string.share_track_url_body_format).toString(), url);
 
     Intent shareIntent = new Intent(Intent.ACTION_SEND);
     shareIntent.setType("text/plain");
     shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-        getResources().getText(R.string.share_map_subject).toString());
+        getResources().getText(R.string.share_track_subject).toString());
     shareIntent.putExtra(Intent.EXTRA_TEXT, msg);
     startActivity(Intent.createChooser(shareIntent,
-        getResources().getText(R.string.share_map).toString()));
+        getResources().getText(R.string.share_track_picker_title).toString()));
   }
 
   protected String getFusionTablesUrl(long trackId) {

MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java

@@ -67,10 +67,6 @@ public abstract class AntSensorManager extends SensorManager {
 
   private AntInterface antReceiver;
 
-  // Flag to know if the ANT App was interrupted
-  // TODO: This code path is not used but probably should be.
-  private boolean antInterrupted;
-
   /**
    * The data from the sensors.
    */
@@ -126,33 +122,19 @@ public abstract class AntSensorManager extends SensorManager {
 
   public AntSensorManager(Context context) {
     this.context = context;
+    
+    // We register for ANT intents early because we want to have a record of
+    // the status intents in the log as we start up.
+    registerForAntIntents();
+
   }
 
   @Override
   public void onDestroy() {
     Log.i(TAG, "destroying AntSensorManager");
-    try {
-      context.unregisterReceiver(statusReceiver);
-    } catch (IllegalArgumentException e) {
-      Log.w(TAG, "Failed to unregister ANT status receiver", e);
-    }
-
-    try {
-      context.unregisterReceiver(dataReceiver);
-    } catch (IllegalArgumentException e) {
-      Log.w(TAG, "Failed to unregister ANT data receiver", e);
-    }
-
-    if (antReceiver != null) {
-      try {
-        antReceiver.releaseInterface();
-      } catch (AntServiceNotConnectedException e) {
-        Log.i(TAG, "ANT service not connected", e);
-      } catch (AntInterfaceException e) {
-        Log.e(TAG, "failed to release ANT interface", e);
-      }
-      antReceiver.destroy();
-    }
+    
+    cleanAntInterface();
+    unregisterForAntIntents();
   }
 
   @Override
@@ -177,16 +159,18 @@ public abstract class AntSensorManager extends SensorManager {
    */
   @Override
   protected final void setupChannel() {
+    setup();
+  }
+  
+  private synchronized void setup() {
     // We handle this unpleasantly because the UI should've checked for ANT
     // support before it even instantiated this class.
     if (!AntInterface.hasAntSupport(context)) {
       throw new IllegalStateException("device does not have ANT support");
     }
-
-    // We register for ANT intents early because we want to have a record of
-    // the status intents in the log as we start up.
-    registerForAntIntents();
-
+    
+    cleanAntInterface();
+    
     antReceiver = AntInterface.getInstance(context, antServiceListener);
 
     if (antReceiver == null) {
@@ -197,6 +181,29 @@ public abstract class AntSensorManager extends SensorManager {
     setSensorState(Sensor.SensorState.CONNECTING);
   }
 
+  /**
+   * Cleans up the ANT+ receiver interface, by releasing the interface
+   * and destroying it.
+   */
+  private void cleanAntInterface()
+  {
+    Log.i(TAG, "Destroying AntSensorManager");
+    
+    if (antReceiver != null) {
+      try {
+        antReceiver.releaseInterface();
+      } catch (AntServiceNotConnectedException e) {
+        Log.i(TAG, "ANT service not connected", e);
+      } catch (AntInterfaceException e) {
+        Log.e(TAG, "failed to release ANT interface", e);
+      }
+  
+      antReceiver.destroy();
+      
+      antReceiver = null;
+    }
+  }
+  
   /**
    * This method is invoked via the ServiceListener when we're connected to
    * the ANT service.  If we're just starting up, this is our first opportunity
@@ -214,10 +221,8 @@ public abstract class AntSensorManager extends SensorManager {
       if (!antReceiver.isEnabled()) {
         // Make sure not to call AntInterface.enable() again, if it has been
         // already called before
-        if (antInterrupted == false) {
-          Log.i(TAG, "Powering on Radio");
-          antReceiver.enable();
-        }
+        Log.i(TAG, "Powering on Radio");
+        antReceiver.enable();
       } else {
         Log.i(TAG, "Radio already enabled");
       }
@@ -337,6 +342,23 @@ public abstract class AntSensorManager extends SensorManager {
     dataIntentFilter.addAction(AntInterfaceIntent.ANT_RX_MESSAGE_ACTION);
     context.registerReceiver(dataReceiver, dataIntentFilter);
   }
+  
+  private void unregisterForAntIntents()
+  {
+    Log.i(TAG, "Unregistering ANT Intents.");
+    
+    try {
+      context.unregisterReceiver(statusReceiver);
+    } catch (IllegalArgumentException e) {
+      Log.w(TAG, "Failed to unregister ANT status receiver", e);
+    }
+
+    try {
+      context.unregisterReceiver(dataReceiver);
+    } catch (IllegalArgumentException e) {
+      Log.w(TAG, "Failed to unregister ANT data receiver", e);
+    }
+  }  
 
   private String messageToString(byte[] message) {
     StringBuilder out = new StringBuilder();