From ca94fc7a96b4b3ccad88b926824c05d6dbc52688 Mon Sep 17 00:00:00 2001
From: Matthew Simmons <simmonmt@acm.org>
Date: Fri, 4 Feb 2011 17:15:34 -0500
Subject: [PATCH] Reuse existing messages

---
 MyTracks/res/values/strings.xml                            | 5 ++---
 .../android/apps/mytracks/io/SendToFusionTables.java       | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 7f4a94816..9b5d4a24f 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -63,13 +63,12 @@ limitations under the License.
   <!-- Progress dialog -->
   <string name="progress_title">Please wait...</string>
   <string name="progress_message">Sending your track to Google.</string>
+  <string name="progress_message_reading_track">Reading track...</string>
   <string name="progress_message_authenticating_fusiontables">Authenticating to Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">Authenticating to Google Docs...</string>
   <string name="progress_message_sending_docs">Sending track to Google Docs...</string>
+  <string name="progress_message_sending_fusiontables">Sending track to Fusion Tables...</string>
   <string name="progress_message_creating_fusiontable">Creating new Fusion table...</string>
-  <string name="progress_message_initializing">Initializing</string>
-  <string name="progress_message_uploading_track_data">Uploading track data</string>
-  <string name="progress_message_uploading_waypoints">Uploading waypoints</string>
   <string name="import_progress_message">Importing a GPS track. This may take a while.</string>
   <string name="write_progress_message">Writing file to SD card. This may take a while.</string>
   <string name="progress_message_updating_track">Updating track statistics...</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index 467eedccb..0fcfd7a8b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -169,7 +169,7 @@ public class SendToFusionTables implements Runnable {
     boolean success = true;
     try {
       progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
-      progressIndicator.setProgressMessage(R.string.progress_message_initializing);
+      progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -183,7 +183,7 @@ public class SendToFusionTables implements Runnable {
       }
 
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
-      progressIndicator.setProgressMessage(R.string.progress_message_uploading_track_data);
+      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusiontables);
 
       // Upload all of the segments of the track plus start/end markers
       if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -191,7 +191,6 @@ public class SendToFusionTables implements Runnable {
       }
       
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_WAYPOINTS);
-      progressIndicator.setProgressMessage(R.string.progress_message_uploading_waypoints);
 
       // Upload all the waypoints.
       if (!uploadWaypoints(track)) {
@@ -231,7 +230,7 @@ public class SendToFusionTables implements Runnable {
 
   private boolean makeTableUnlisted(String tableId) {
     Log.d(MyTracksConstants.TAG, "Setting visibility to unlisted.");
-    String query = "UPDATE TABLE " + tableId + " SET VISIBILITY = unlisted";
+    String query = "UPDATE TABLE " + tableId + " SET VISIBILITY = UNLISTED";
     return runUpdate(query);
   }