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

Reuse existing messages

Browse Source
This commit is contained in:
Matthew Simmons
2011-02-04 17:15:34 -05:00
parent 9d650c4885
commit ca94fc7a96
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/strings.xml
+2 -3
View File
@@ -63,13 +63,12 @@ limitations under the License.
<!-- Progress dialog --> <!-- Progress dialog -->
<string name="progress_title">Please wait...</string> <string name="progress_title">Please wait...</string>
<string name="progress_message">Sending your track to Google.</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_fusiontables">Authenticating to Google Fusion Tables...</string>
<string name="progress_message_authenticating_docs">Authenticating to Google Docs...</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_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_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="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="write_progress_message">Writing file to SD card. This may take a while.</string>
<string name="progress_message_updating_track">Updating track statistics...</string> <string name="progress_message_updating_track">Updating track statistics...</string>
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+3 -4
View File
@@ -169,7 +169,7 @@ public class SendToFusionTables implements Runnable {
boolean success = true; boolean success = true;
try { try {
progressIndicator.setProgressValue(PROGRESS_INITIALIZATION); progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
progressIndicator.setProgressMessage(R.string.progress_message_initializing); progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
// Get the track meta-data // Get the track meta-data
Track track = providerUtils.getTrack(trackId); Track track = providerUtils.getTrack(trackId);
@@ -183,7 +183,7 @@ public class SendToFusionTables implements Runnable {
} }
progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN); 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 // Upload all of the segments of the track plus start/end markers
if (!uploadAllTrackPoints(track, originalDescription)) { if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -191,7 +191,6 @@ public class SendToFusionTables implements Runnable {
} }
progressIndicator.setProgressValue(PROGRESS_UPLOAD_WAYPOINTS); progressIndicator.setProgressValue(PROGRESS_UPLOAD_WAYPOINTS);
progressIndicator.setProgressMessage(R.string.progress_message_uploading_waypoints);
// Upload all the waypoints. // Upload all the waypoints.
if (!uploadWaypoints(track)) { if (!uploadWaypoints(track)) {
@@ -231,7 +230,7 @@ public class SendToFusionTables implements Runnable {
private boolean makeTableUnlisted(String tableId) { private boolean makeTableUnlisted(String tableId) {
Log.d(MyTracksConstants.TAG, "Setting visibility to unlisted."); 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); return runUpdate(query);
} }