karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-10-27 18:13:04 -07:00
parent f6d99ba106 0c72f1e5d3
commit b6dcbb1377
22 changed files with 181 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class ExportAllTracks {
TrackWriter writer =
TrackWriterFactory.newWriter(activity, providerUtils, id, format);
if (writer == null) {
showToast(R.string.error_track_does_not_exist, Toast.LENGTH_LONG);
showToast(R.string.error_export_track_does_not_exist, Toast.LENGTH_LONG);
return;
}
MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+1 -1
View File
@@ -531,7 +531,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
if (isGpsDisabled) {
// Give a warning about this state.
Toast.makeText(MapActivity.this,
R.string.error_no_gps_location_provider,
R.string.error_no_gps,
Toast.LENGTH_LONG).show();
// Make clicking take the user to the location settings.
MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class SendToDocs {
private void doUpload(long trackId) {
// TODO
statusMessage = activity.getString(R.string.error_sending_to_fusiontables);
statusMessage = activity.getString(R.string.error_sending_to_fusion_tables);
success = false;
try {
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class SendToFusionTables implements Runnable {
}
private void doUpload() {
int statusMessageId = R.string.error_sending_to_fusiontables;
int statusMessageId = R.string.error_sending_to_fusion_tables;
boolean success = true;
try {
progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class SendToMyMaps implements Runnable {
}
private void doUpload() {
int statusMessageId = R.string.error_sending_to_mymap;
int statusMessageId = R.string.error_sending_to_my_maps;
boolean success = true;
try {
progressIndicator.setProgressMessage(
MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+5 -5
View File
@@ -172,19 +172,19 @@ public class ImportActivity extends Activity {
importedTrackIds = GpxImporter.importGPXFile(is, providerUtils);
} catch (SAXException e) {
Log.e(TAG, "Caught an unexpected exception.", e);
resultMessage = R.string.error_generic;
resultMessage = R.string.error_import_generic;
} catch (ParserConfigurationException e) {
Log.e(TAG, "Caught an unexpected exception.", e);
resultMessage = R.string.error_generic;
resultMessage = R.string.error_import_generic;
} catch (IOException e) {
Log.e(TAG, "Caught an unexpected exception.", e);
resultMessage = R.string.error_unable_to_read_file;
resultMessage = R.string.error_import_unable_to_read_file;
} catch (NullPointerException e) {
Log.e(TAG, "Caught an unexpected exception.", e);
resultMessage = R.string.error_invalid_gpx_format;
resultMessage = R.string.error_import_invalid_gpx_format;
} catch (OutOfMemoryError e) {
Log.e(TAG, "Caught an unexpected exception.", e);
resultMessage = R.string.error_out_of_memory;
resultMessage = R.string.error_import_out_of_memory;
}
boolean success = (importedTrackIds != null && importedTrackIds.length > 0);
MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+2 -2
View File
@@ -114,7 +114,7 @@ class TrackWriterImpl implements TrackWriter {
private void doWriteTrack() {
// Open the input and output
success = false;
errorMessage = R.string.error_track_does_not_exist;
errorMessage = R.string.error_export_track_does_not_exist;
if (track != null) {
if (openFile()) {
try {
@@ -127,7 +127,7 @@ class TrackWriterImpl implements TrackWriter {
}
}
success = false;
errorMessage = R.string.error_operation_cancelled;
errorMessage = R.string.error_export_operation_canceled;
}
}
}