diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 5dc90998b..e18dd20a7 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -159,7 +159,7 @@ limitations under the License.
android:name="android.app.default_searchable"
android:value="com.google.android.apps.mytracks.SearchActivity" />
-
+
- {
+public class ExportAsyncTask extends AsyncTask {
- private ExportAllActivity exportAllActivity;
+ private ExportActivity exportActivity;
private final TrackFileFormat trackFileFormat;
private final Context context;
private final MyTracksProviderUtils myTracksProviderUtils;
@@ -56,24 +56,23 @@ public class ExportAllAsyncTask extends AsyncTask {
/**
* Creates an AsyncTask.
*
- * @param exportAllActivity the activity currently associated with this
- * AsyncTask
+ * @param exportActivity the activity currently associated with this AsyncTask
* @param trackFileFormat the track file format
*/
- public ExportAllAsyncTask(ExportAllActivity exportAllActivity, TrackFileFormat trackFileFormat) {
- this.exportAllActivity = exportAllActivity;
+ public ExportAsyncTask(ExportActivity exportActivity, TrackFileFormat trackFileFormat) {
+ this.exportActivity = exportActivity;
this.trackFileFormat = trackFileFormat;
- context = exportAllActivity.getApplicationContext();
- myTracksProviderUtils = MyTracksProviderUtils.Factory.get(exportAllActivity);
+ context = exportActivity.getApplicationContext();
+ myTracksProviderUtils = MyTracksProviderUtils.Factory.get(exportActivity);
- SharedPreferences sharedPreferences = exportAllActivity.getSharedPreferences(
+ SharedPreferences sharedPreferences = exportActivity.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
long recordingTrackId = sharedPreferences.getLong(
- exportAllActivity.getString(R.string.recording_track_key), -1L);
+ exportActivity.getString(R.string.recording_track_key), -1L);
// Get the wake lock if not recording
if (recordingTrackId == -1L) {
- wakeLock = SystemUtils.acquireWakeLock(exportAllActivity, wakeLock);
+ wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock);
}
success = false;
completed = false;
@@ -81,21 +80,21 @@ public class ExportAllAsyncTask extends AsyncTask {
}
/**
- * Sets the current {@link ExportAllActivity} associated with this AyncTask.
+ * Sets the current {@link ExportActivity} associated with this AyncTask.
*
- * @param exportAllActivity the current {@link ExportAllActivity}, can be null
+ * @param exportActivity the current {@link ExportActivity}, can be null
*/
- public void setActivity(ExportAllActivity exportAllActivity) {
- this.exportAllActivity = exportAllActivity;
- if (completed && exportAllActivity != null) {
- exportAllActivity.onAsyncTaskCompleted(success, messageId);
+ public void setActivity(ExportActivity exportActivity) {
+ this.exportActivity = exportActivity;
+ if (completed && exportActivity != null) {
+ exportActivity.onAsyncTaskCompleted(success, messageId);
}
}
@Override
protected void onPreExecute() {
- if (exportAllActivity != null) {
- exportAllActivity.showProgressDialog();
+ if (exportActivity != null) {
+ exportActivity.showProgressDialog();
}
}
@@ -144,8 +143,8 @@ public class ExportAllAsyncTask extends AsyncTask {
@Override
protected void onProgressUpdate(Integer... values) {
- if (exportAllActivity != null) {
- exportAllActivity.setProgressDialogValue(values[0], values[1]);
+ if (exportActivity != null) {
+ exportActivity.setProgressDialogValue(values[0], values[1]);
}
}
@@ -153,8 +152,8 @@ public class ExportAllAsyncTask extends AsyncTask {
protected void onPostExecute(Boolean result) {
success = result;
completed = true;
- if (exportAllActivity != null) {
- exportAllActivity.onAsyncTaskCompleted(success, messageId);
+ if (exportActivity != null) {
+ exportActivity.onAsyncTaskCompleted(success, messageId);
}
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
index 8d47e1be3..b09845d2c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
@@ -72,7 +72,7 @@ public class ImportActivity extends Activity {
Intent intent = getIntent();
importAll = intent.getBooleanExtra(EXTRA_IMPORT_ALL, false);
if (importAll) {
- path = new FileUtils().buildExternalDirectoryPath("gpx");
+ path = FileUtils.buildExternalDirectoryPath("gpx");
} else {
String action = intent.getAction();
if (!(Intent.ACTION_ATTACH_DATA.equals(action) || Intent.ACTION_VIEW.equals(action))) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java
index 4e8898936..e5c82a2b4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAsyncTask.java
@@ -121,8 +121,7 @@ public class ImportAsyncTask extends AsyncTask {
@Override
protected Boolean doInBackground(Void... params) {
try {
- FileUtils fileUtils = new FileUtils();
- if (!fileUtils.isSdCardAvailable()) {
+ if (!FileUtils.isSdCardAvailable()) {
return false;
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 8a770adaa..d578a2170 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -32,8 +32,8 @@ import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection
import com.google.android.apps.mytracks.util.AnalyticsUtils;
import com.google.android.apps.mytracks.util.ApiAdapterFactory;
import com.google.android.apps.mytracks.util.EulaUtils;
-import com.google.android.apps.mytracks.util.SystemUtils;
import com.google.android.apps.mytracks.util.UriUtils;
+import com.google.android.maps.mytracks.BuildConfig;
import com.google.android.maps.mytracks.R;
import android.app.Activity;
@@ -73,7 +73,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
private static final int DIALOG_CHECK_UNITS_ID = 1;
private static final String CHECK_UNITS_PREFERENCE_FILE = "checkunits";
private static final String CHECK_UNITS_PREFERENCE_KEY = "checkunits.checked";
-
+
private TrackDataHub dataHub;
/**
@@ -140,7 +140,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
protected void onCreate(Bundle savedInstanceState) {
Log.d(TAG, "MyTracks.onCreate");
super.onCreate(savedInstanceState);
- if (!SystemUtils.isRelease(this)) {
+ if (BuildConfig.DEBUG) {
ApiAdapterFactory.getApiAdapter().enableStrictMode();
}
@@ -153,7 +153,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
serviceConnection = new TrackRecordingServiceConnection(this, serviceBindCallback);
setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
-
+
// Show the action bar (or nothing at all).
ApiAdapterFactory.getApiAdapter().showActionBar(this);
@@ -167,7 +167,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
android.R.drawable.ic_menu_mapmode))
.setContent(new Intent(this, MapActivity.class)));
tabHost.addTab(tabHost.newTabSpec(STATS_TAB_TAG)
- .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats))
+ .setIndicator("Stats", res.getDrawable(R.drawable.ic_menu_statistics))
.setContent(new Intent(this, StatsActivity.class)));
tabHost.addTab(tabHost.newTabSpec(CHART_TAB_TAG)
.setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation))
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index cc8bc8d1b..9e2765a6e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -354,8 +354,8 @@ public class TrackList extends ListActivity
@Override
public void onClick(DialogInterface dialog, int which) {
int index = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
- Intent intent = new Intent(TrackList.this, ExportAllActivity.class);
- intent.putExtra(ExportAllActivity.EXTRA_TRACK_FILE_FORMAT,
+ Intent intent = new Intent(TrackList.this, ExportActivity.class).putExtra(
+ ExportActivity.EXTRA_TRACK_FILE_FORMAT,
(Parcelable) TrackFileFormat.values()[index]);
TrackList.this.startActivity(intent);
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java
index 3ef19ad31..fd0675640 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java
@@ -53,7 +53,7 @@ public class BackupAsyncTask extends AsyncTask {
*/
public BackupAsyncTask(BackupActivity backupActivity) {
this.backupActivity = backupActivity;
- this.externalFileBackup = new ExternalFileBackup(backupActivity, new FileUtils());
+ this.externalFileBackup = new ExternalFileBackup(backupActivity);
success = false;
completed = false;
messageId = R.string.sd_card_error_write_file;
@@ -80,9 +80,7 @@ public class BackupAsyncTask extends AsyncTask {
@Override
protected Boolean doInBackground(Void... params) {
- FileUtils fileUtils = new FileUtils();
-
- if (!fileUtils.isSdCardAvailable()) {
+ if (!FileUtils.isSdCardAvailable()) {
messageId = R.string.sd_card_error_no_storage;
return false;
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
index 68a0aea09..7fe2b3c2b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
@@ -65,11 +65,9 @@ class ExternalFileBackup {
private static final int COMPRESSION_LEVEL = 8;
private final Context context;
- private final FileUtils fileUtils;
- public ExternalFileBackup(Context context, FileUtils fileUtils) {
+ public ExternalFileBackup(Context context) {
this.context = context;
- this.fileUtils = fileUtils;
}
/**
@@ -87,12 +85,12 @@ class ExternalFileBackup {
* @param create whether to try creating the directory if it doesn't exist
*/
private File getBackupsDirectory(boolean create) {
- String dirName = fileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR);
+ String dirName = FileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR);
final File dir = new File(dirName);
Log.d(Constants.TAG, "Dir: " + dir.getAbsolutePath());
if (create) {
// Try to create - if that fails, return null
- return fileUtils.ensureDirectoryExists(dir) ? dir : null;
+ return FileUtils.ensureDirectoryExists(dir) ? dir : null;
} else {
// Return it if it already exists, otherwise return null
return dir.isDirectory() ? dir : null;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java
index 23917d521..009c0d44f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java
@@ -16,7 +16,6 @@
package com.google.android.apps.mytracks.io.backup;
-import com.google.android.apps.mytracks.util.FileUtils;
import com.google.android.maps.mytracks.R;
import android.os.AsyncTask;
@@ -57,7 +56,7 @@ public class RestoreAsyncTask extends AsyncTask {
public RestoreAsyncTask(RestoreActivity restoreActivity, Date date) {
this.restoreActivity = restoreActivity;
this.date = date;
- this.externalFileBackup = new ExternalFileBackup(restoreActivity, new FileUtils());
+ this.externalFileBackup = new ExternalFileBackup(restoreActivity);
success = false;
completed = false;
messageId = R.string.sd_card_error_read_file;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
index 8b5fc81c7..433497147 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
@@ -55,11 +55,10 @@ public class RestoreChooserActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- FileUtils fileUtils = new FileUtils();
- ExternalFileBackup externalFileBackup = new ExternalFileBackup(this, fileUtils);
+ ExternalFileBackup externalFileBackup = new ExternalFileBackup(this);
// Get the list of existing backups
- if (!fileUtils.isSdCardAvailable()) {
+ if (!FileUtils.isSdCardAvailable()) {
Toast.makeText(this, R.string.sd_card_error_no_storage, Toast.LENGTH_LONG).show();
finish();
return;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 8ecbfb596..e3b4a9716 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -101,7 +101,7 @@ public class SaveActivity extends Activity {
}
if (shareTrack || playTrack) {
// Save to the temp directory
- String dirName = new FileUtils().buildExternalDirectoryPath(
+ String dirName = FileUtils.buildExternalDirectoryPath(
trackFileFormat.getExtension(), "tmp");
trackWriter.setDirectory(new File(dirName));
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 76517544b..977ea8692 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -52,7 +52,6 @@ class TrackWriterImpl implements TrackWriter {
private final MyTracksProviderUtils providerUtils;
private final Track track;
private final TrackFormatWriter writer;
- private final FileUtils fileUtils;
private boolean success = false;
private int errorMessage = -1;
private File directory = null;
@@ -66,7 +65,6 @@ class TrackWriterImpl implements TrackWriter {
this.providerUtils = providerUtils;
this.track = track;
this.writer = writer;
- this.fileUtils = new FileUtils();
}
@Override
@@ -175,7 +173,7 @@ class TrackWriterImpl implements TrackWriter {
}
// Make sure the file doesn't exist yet (possibly by changing the filename)
- String fileName = fileUtils.buildUniqueFileName(
+ String fileName = FileUtils.buildUniqueFileName(
directory, track.getName(), writer.getExtension());
if (fileName == null) {
Log.e(Constants.TAG,
@@ -200,16 +198,16 @@ class TrackWriterImpl implements TrackWriter {
protected boolean canWriteFile() {
if (directory == null) {
String dirName =
- fileUtils.buildExternalDirectoryPath(writer.getExtension());
+ FileUtils.buildExternalDirectoryPath(writer.getExtension());
directory = newFile(dirName);
}
- if (!fileUtils.isSdCardAvailable()) {
+ if (!FileUtils.isSdCardAvailable()) {
Log.i(Constants.TAG, "Could not find SD card.");
errorMessage = R.string.sd_card_error_no_storage;
return false;
}
- if (!fileUtils.ensureDirectoryExists(directory)) {
+ if (!FileUtils.ensureDirectoryExists(directory)) {
Log.i(Constants.TAG, "Could not create export directory.");
errorMessage = R.string.sd_card_error_create_dir;
return false;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
index 0a36b2e66..9866aca3f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
@@ -91,10 +91,7 @@ public class RemoveTempFilesService extends Service {
}
private void cleanTempDirectory(String name) {
- FileUtils fileUtils = new FileUtils();
- String dirName = fileUtils.buildExternalDirectoryPath(name, "tmp");
- File dir = new File(dirName);
- cleanTempDirectory(dir);
+ cleanTempDirectory(new File(FileUtils.buildExternalDirectoryPath(name, "tmp")));
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
index f646ab1cd..58bfb95a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.services;
import static com.google.android.apps.mytracks.Constants.TAG;
import com.google.android.apps.mytracks.util.SystemUtils;
+import com.google.android.maps.mytracks.BuildConfig;
import android.content.ComponentName;
import android.content.Context;
@@ -157,7 +158,7 @@ public class TrackRecordingServiceConnection {
Log.i(TAG, "Binding to the service");
Intent intent = new Intent(context, TrackRecordingService.class);
- int flags = SystemUtils.isRelease(context) ? 0 : Context.BIND_DEBUG_UNBIND;
+ int flags = BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0;
context.bindService(intent, serviceConnection, flags);
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java
index 1006e4a6b..2a16fb743 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java
@@ -23,7 +23,7 @@ import com.dsi.ant.exception.AntInterfaceException;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.content.Sensor;
import com.google.android.apps.mytracks.util.ApiAdapterFactory;
-import com.google.android.apps.mytracks.util.SystemUtils;
+import com.google.android.maps.mytracks.BuildConfig;
import com.google.android.maps.mytracks.R;
import android.content.Context;
@@ -32,7 +32,7 @@ import android.util.Log;
/**
* A sensor manager to the PC7 SRM ANT+ bridge.
- *
+ *
* @author Sandor Dornbush
* @author Umran Abdulla
*/
@@ -54,15 +54,15 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
private static final int INDEX_MESSAGE_SPEED = 5;
private static final int INDEX_MESSAGE_CADENCE = 7;
private static final int INDEX_MESSAGE_BPM = 8;
-
+
private static final int MSG_INITIAL = 5;
private static final int MSG_DATA = 6;
-
+
private short deviceNumber;
public AntSrmBridgeSensorManager(Context context) {
super(context);
-
+
Log.i(TAG, "new ANT SRM Bridge Sensor Manager created");
deviceNumber = WILDCARD;
@@ -77,15 +77,15 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
}
Log.i(TAG, "Will pair with device: " + deviceNumber);
}
-
-
+
+
@Override
protected boolean handleMessage(byte messageId, byte[] messageData) {
if (super.handleMessage(messageId, messageData)) {
return true;
}
-
- if (!SystemUtils.isRelease(context)) {
+
+ if (BuildConfig.DEBUG) {
Log.d(TAG, "Received ANT msg: " + AntUtils.antMessageToString(messageId) + "(" + messageId + ")");
}
@@ -100,7 +100,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
return true;
}
-
+
/**
* Decode an ant device message.
* @param messageData The byte array received from the device.
@@ -132,10 +132,10 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
}
setSensorState(Sensor.SensorState.CONNECTED);
-
+
int messageType = antMessage[INDEX_MESSAGE_TYPE] & 0xFF;
Log.d(TAG, "Received message-type=" + messageType);
-
+
switch (messageType) {
case MSG_INITIAL:
break;
@@ -149,7 +149,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
{
int messageId = msg[INDEX_MESSAGE_ID] & 0xFF;
Log.d(TAG, "Received message-id=" + messageId);
-
+
int powerVal = (((msg[INDEX_MESSAGE_POWER] & 0xFF) << 8) |
(msg[INDEX_MESSAGE_POWER+1] & 0xFF));
@SuppressWarnings("unused")
@@ -158,12 +158,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
int cadenceVal = (msg[INDEX_MESSAGE_CADENCE] & 0xFF);
int bpmVal = (msg[INDEX_MESSAGE_BPM] & 0xFF);
long time = System.currentTimeMillis();
-
- Sensor.SensorData.Builder power =
+
+ Sensor.SensorData.Builder power =
Sensor.SensorData.newBuilder()
.setValue(powerVal)
.setState(Sensor.SensorState.SENDING);
-
+
/*
* Although speed is available from the SRM Bridge, MyTracks doesn't use the value, and
* computes speed from the GPS location data.
@@ -171,12 +171,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
// Sensor.SensorData.Builder speed = Sensor.SensorData.newBuilder().setValue(speedVal).setState(
// Sensor.SensorState.SENDING);
- Sensor.SensorData.Builder cadence =
+ Sensor.SensorData.Builder cadence =
Sensor.SensorData.newBuilder()
.setValue(cadenceVal)
.setState(Sensor.SensorState.SENDING);
- Sensor.SensorData.Builder bpm =
+ Sensor.SensorData.Builder bpm =
Sensor.SensorData.newBuilder()
.setValue(bpmVal)
.setState(Sensor.SensorState.SENDING);
@@ -189,7 +189,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
.setHeartRate(bpm)
.build();
}
-
+
void handleChannelId(byte[] rawMessage) {
AntChannelIdMessage message = new AntChannelIdMessage(rawMessage);
deviceNumber = message.getDeviceNumber();
@@ -203,12 +203,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager {
}
private void handleMessageResponse(byte[] rawMessage) {
- AntChannelResponseMessage message =
+ AntChannelResponseMessage message =
new AntChannelResponseMessage(rawMessage);
- if (!SystemUtils.isRelease(context)) {
+ if (BuildConfig.DEBUG) {
Log.d(TAG, "Received ANT Response: " + AntUtils.antMessageToString(message.getMessageId()) +
"(" + message.getMessageId() + ")" +
- ", Code: " + AntUtils.antEventToStr(message.getMessageCode()) +
+ ", Code: " + AntUtils.antEventToStr(message.getMessageCode()) +
"(" + message.getMessageCode() + ")");
}
switch (message.getMessageId()) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
index 99ce45838..11d7ff5da 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
@@ -29,20 +29,46 @@ import java.io.File;
*/
public class FileUtils {
+ private FileUtils() {}
+
/**
* The maximum FAT32 path length. See the FAT32 spec at
* http://msdn.microsoft.com/en-us/windows/hardware/gg463080
*/
@VisibleForTesting
static final int MAX_FAT32_PATH_LENGTH = 260;
-
+
+ /**
+ * Returns whether the SD card is available.
+ */
+ public static boolean isSdCardAvailable() {
+ return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
+ }
+
+ /**
+ * Ensures the given directory exists by creating it and its parents if
+ * necessary.
+ *
+ * @return whether the directory exists (either already existed or was
+ * successfully created)
+ */
+ public static boolean ensureDirectoryExists(File dir) {
+ if (dir.exists() && dir.isDirectory()) {
+ return true;
+ }
+ if (dir.mkdirs()) {
+ return true;
+ }
+ return false;
+ }
+
/**
* Builds a path inside the My Tracks directory in the SD card.
*
* @param components the path components inside the mytracks directory
* @return the full path to the destination
*/
- public String buildExternalDirectoryPath(String... components) {
+ public static String buildExternalDirectoryPath(String... components) {
StringBuilder dirNameBuilder = new StringBuilder();
dirNameBuilder.append(Environment.getExternalStorageDirectory());
dirNameBuilder.append(File.separatorChar);
@@ -54,33 +80,6 @@ public class FileUtils {
return dirNameBuilder.toString();
}
- /**
- * Returns whether the SD card is available.
- */
- public boolean isSdCardAvailable() {
- return Environment.MEDIA_MOUNTED.equals(
- Environment.getExternalStorageState());
- }
-
- /**
- * Ensures the given directory exists by creating it and its parents if
- * necessary.
- *
- * @return whether the directory exists (either already existed or was
- * successfully created)
- */
- public boolean ensureDirectoryExists(File dir) {
- if (dir.exists() && dir.isDirectory()) {
- return true;
- }
-
- if (dir.mkdirs()) {
- return true;
- }
-
- return false;
- }
-
/**
* Builds a filename with the given base name (prefix) and the given
* extension, possibly adding a suffix to ensure the file doesn't exist.
@@ -90,8 +89,8 @@ public class FileUtils {
* @param extension the file's extension
* @return the complete file name, without the directory
*/
- public synchronized String buildUniqueFileName(File directory,
- String fileBaseName, String extension) {
+ public static synchronized String buildUniqueFileName(
+ File directory, String fileBaseName, String extension) {
return buildUniqueFileName(directory, fileBaseName, extension, 0);
}
@@ -105,7 +104,8 @@ public class FileUtils {
* @param suffix the first numeric suffix to try to use, or 0 for none
* @return the complete filename, without the directory
*/
- private String buildUniqueFileName(File directory, String base, String extension, int suffix) {
+ private static String buildUniqueFileName(
+ File directory, String base, String extension, int suffix) {
String suffixName = "";
if (suffix > 0) {
suffixName += "(" + Integer.toString(suffix) + ")";
@@ -115,8 +115,8 @@ public class FileUtils {
String baseName = sanitizeFileName(base);
baseName = truncateFileName(directory, baseName, suffixName);
String fullName = baseName + suffixName;
-
- if (!fileExists(directory, fullName)) {
+
+ if (!new File(directory, fullName).exists()) {
return fullName;
}
return buildUniqueFileName(directory, base, extension, suffix + 1);
@@ -131,7 +131,7 @@ public class FileUtils {
* @param name name
*/
@VisibleForTesting
- String sanitizeFileName(String name) {
+ static String sanitizeFileName(String name) {
StringBuffer buffer = new StringBuffer(name.length());
for (int i = 0; i < name.length(); i++) {
int codePoint = name.codePointAt(i);
@@ -145,13 +145,13 @@ public class FileUtils {
String result = buffer.toString();
return result.replaceAll("_+", "_");
}
-
+
/**
* Returns true if it is a special FAT32 character.
- *
+ *
* @param character the character
*/
- private boolean isSpecialFat32(char character) {
+ private static boolean isSpecialFat32(char character) {
switch (character) {
case '$':
case '%':
@@ -191,8 +191,8 @@ public class FileUtils {
* @param suffix suffix
*/
@VisibleForTesting
- String truncateFileName(File directory, String name, String suffix) {
- // 1 at the end accounts for the FAT32 filename trailing NUL character
+ static String truncateFileName(File directory, String name, String suffix) {
+ // 1 at the end accounts for the FAT32 filename trailing NUL character
int requiredLength = directory.getPath().length() + suffix.length() + 1;
if (name.length() + requiredLength > MAX_FAT32_PATH_LENGTH) {
int limit = MAX_FAT32_PATH_LENGTH - requiredLength;
@@ -201,13 +201,4 @@ public class FileUtils {
return name;
}
}
-
- /**
- * Checks whether a file with the given name exists in the given directory.
- * This is isolated so it can be overridden in tests.
- */
- protected boolean fileExists(File directory, String fullName) {
- File file = new File(directory, fullName);
- return file.exists();
- }
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java
index c45c88308..b0dc284d6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java
@@ -1,12 +1,12 @@
/*
* Copyright 2011 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
@@ -22,7 +22,6 @@ import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.Signature;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.util.Log;
@@ -34,26 +33,6 @@ import android.util.Log;
*/
public class SystemUtils {
- private static final int RELEASE_SIGNATURE_HASHCODE = -1855564782;
-
- /**
- * Returns whether or not this is a release build.
- */
- public static boolean isRelease(Context context) {
- try {
- Signature [] sigs = context.getPackageManager().getPackageInfo(
- context.getPackageName(), PackageManager.GET_SIGNATURES).signatures;
- for (Signature sig : sigs) {
- if (sig.hashCode() == RELEASE_SIGNATURE_HASHCODE) {
- return true;
- }
- }
- } catch (NameNotFoundException e) {
- Log.e(Constants.TAG, "Unable to get signatures", e);
- }
- return false;
- }
-
/**
* Get the My Tracks version from the manifest.
*
diff --git a/MyTracksLib/.classpath b/MyTracksLib/.classpath
index 996e75add..4aeffd3c3 100644
--- a/MyTracksLib/.classpath
+++ b/MyTracksLib/.classpath
@@ -4,5 +4,6 @@
+
diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath
index 6044ff11f..a59367532 100644
--- a/MyTracksTest/.classpath
+++ b/MyTracksTest/.classpath
@@ -11,5 +11,6 @@
+
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
index 8adda2946..12152c3c7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
@@ -20,8 +20,6 @@ import com.google.android.apps.mytracks.Constants;
import android.os.Environment;
import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
import junit.framework.TestCase;
@@ -31,76 +29,81 @@ import junit.framework.TestCase;
* @author Rodrigo Damazio
*/
public class FileUtilsTest extends TestCase {
- private FileUtils fileUtils;
- private Set existingFiles;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- existingFiles = new HashSet();
- fileUtils = new FileUtils() {
- @Override
- protected boolean fileExists(File directory, String fullName) {
- return existingFiles.contains(fullName);
- }
- };
- }
+ /**
+ * Tests {@link FileUtils#buildExternalDirectoryPath(String...)}.
+ */
public void testBuildExternalDirectoryPath() {
- String expectedName = Environment.getExternalStorageDirectory()
- + File.separator
- + Constants.SDCARD_TOP_DIR
- + File.separator
- + "a"
- + File.separator
- + "b"
- + File.separator
+ String expectedName = Environment.getExternalStorageDirectory() + File.separator
+ + Constants.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator
+ "c";
-
- String dirName = fileUtils.buildExternalDirectoryPath("a", "b", "c");
+ String dirName = FileUtils.buildExternalDirectoryPath("a", "b", "c");
assertEquals(expectedName, dirName);
}
/**
- * Tests sanitize filename.
+ * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the
+ * file is new.
+ */
+ public void testBuildUniqueFileName_new() {
+ String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext");
+ assertEquals("Filename.ext", filename);
+ }
+
+ /**
+ * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the
+ * file exists already.
+ */
+ public void testBuildUniqueFileName_exist() {
+ // Expect "/default.prop" to exist on the phone/emulator
+ String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop");
+ assertEquals("default(1).prop", filename);
+ }
+
+ /**
+ * Tests {@link FileUtils#sanitizeFileName(String)} with special characters.
+ * Verifies that they are sanitized.
*/
public void testSanitizeFileName() {
String name = "Swim\10ming-^across:/the/ pacific (ocean).";
String expected = "Swim_ming-^across_the_ pacific (ocean)_";
- assertEquals(expected, fileUtils.sanitizeFileName(name));
+ assertEquals(expected, FileUtils.sanitizeFileName(name));
}
/**
- * Tests characters in other languages, like Chinese and Russian, are allowed.
+ * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in
+ * Chinese and Russian). Verifies that they are allowed.
*/
public void testSanitizeFileName_i18n() {
String name = "您好-привет";
String expected = "您好-привет";
-
- assertEquals(expected, fileUtils.sanitizeFileName(name));
+ assertEquals(expected, FileUtils.sanitizeFileName(name));
}
-
+
/**
- * Tests special FAT32 characters are allowed.
+ * Tests {@link FileUtils#sanitizeFileName(String)} with special FAT32
+ * characters. Verifies that they are allowed.
*/
public void testSanitizeFileName_special_characters() {
String name = "$%'-_@~`!(){}^#&+,;=[] ";
String expected = "$%'-_@~`!(){}^#&+,;=[] ";
-
- assertEquals(expected, fileUtils.sanitizeFileName(name));
+ assertEquals(expected, FileUtils.sanitizeFileName(name));
}
/**
- * Testing collapsing multiple underscores characters.
+ * Tests {@link FileUtils#sanitizeFileName(String)} with multiple escaped
+ * characters in a row. Verifies that they are collapsed into one underscore.
*/
public void testSanitizeFileName_collapse() {
String name = "hello//there";
String expected = "hello_there";
-
- assertEquals(expected, fileUtils.sanitizeFileName(name));
+ assertEquals(expected, FileUtils.sanitizeFileName(name));
}
-
+
+ /**
+ * Tests {@link FileUtils#truncateFileName(File, String, String)}. Verifies
+ * the a long file name is truncated.
+ */
public void testTruncateFileName() {
File directory = new File("/dir1/dir2/");
String suffix = ".gpx";
@@ -109,36 +112,12 @@ public class FileUtilsTest extends TestCase {
name[i] = 'a';
}
String nameString = new String(name);
-
- String truncated = fileUtils.truncateFileName(directory, nameString, suffix);
+ String truncated = FileUtils.truncateFileName(directory, nameString, suffix);
+
for (int i = 0; i < truncated.length(); i++) {
assertEquals('a', truncated.charAt(i));
}
assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH,
new File(directory, truncated + suffix).getPath().length());
}
-
- public void testBuildUniqueFileName_someExist() {
- existingFiles = new HashSet();
- existingFiles.add("Filename.ext");
- existingFiles.add("Filename(1).ext");
- existingFiles.add("Filename(2).ext");
- existingFiles.add("Filename(3).ext");
- existingFiles.add("Filename(4).ext");
-
- String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext");
- assertEquals("Filename(5).ext", filename);
- }
-
- public void testBuildUniqueFileName_oneExists() {
- existingFiles.add("Filename.ext");
-
- String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext");
- assertEquals("Filename(1).ext", filename);
- }
-
- public void testBuildUniqueFileName_noneExists() {
- String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext");
- assertEquals("Filename.ext", filename);
- }
}