From 3cc0e100311874ff49eee97083a1411d39aedeb0 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Thu, 6 Jun 2013 15:45:54 -0700 Subject: [PATCH] Code cleanup. Remove track.getMapId and track.getTableId. --- .../res/raw/mytracks_empty_spreadsheet.ods | Bin 9626 -> 10185 bytes .../mytracks/io/drive/SendDriveAsyncTask.java | 3 -- .../SendFusionTablesAsyncTask.java | 12 +++----- .../fusiontables/SendFusionTablesUtils.java | 13 ++++----- .../mytracks/io/maps/SendMapsAsyncTask.java | 12 +------- .../apps/mytracks/io/maps/SendMapsUtils.java | 17 ------------ .../sendtogoogle/AbstractSendAsyncTask.java | 8 ------ .../io/sendtogoogle/UploadResultActivity.java | 18 +----------- .../SendSpreadsheetsAsyncTask.java | 19 +------------ .../content/MyTracksProviderUtilsImpl.java | 10 ------- .../android/apps/mytracks/content/Track.java | 22 --------------- .../SendFusionTablesUtilsTest.java | 20 ++------------ .../io/maps/SendMapsAsyncTaskTest.java | 17 ------------ .../mytracks/io/maps/SendMapsUtilsTest.java | 26 ------------------ 14 files changed, 15 insertions(+), 182 deletions(-) diff --git a/MyTracks/res/raw/mytracks_empty_spreadsheet.ods b/MyTracks/res/raw/mytracks_empty_spreadsheet.ods index eb7aca654a7e4c92bb020c8d22420e6306c83761..856f33fda1d8100432a22a69d4714686a20090e2 100644 GIT binary patch literal 10185 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%0D!yIJm3oUE)iz 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 diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java index 2dde0638e..566d81972 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveAsyncTask.java @@ -68,9 +68,6 @@ public class SendDriveAsyncTask extends AbstractSendAsyncTask { @Override protected void closeConnection() {} - @Override - protected void saveResult() {} - @Override protected boolean performTask() { try { diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java index b2d4998cd..bf35f2a40 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java @@ -88,9 +88,6 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { @Override protected void closeConnection() {} - @Override - protected void saveResult() {} - @Override protected boolean performTask() { try { @@ -121,7 +118,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { publishProgress(PROGRESS_SET_STYLE); setStyle(fusiontables, tableId); setTemplate(fusiontables, tableId); - if (!setPermission(tableId)) { + if (!setPermission(track, tableId)) { Log.d(TAG, "Cannot set permission for table " + tableId); return false; } @@ -138,9 +135,6 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { return false; } - track.setTableId(tableId); - myTracksProviderUtils.updateTrack(track); - publishProgress(PROGRESS_COMPLETE); return true; @@ -200,7 +194,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { fusiontables.template().insert(tableId, template).execute(); } - private boolean setPermission(String tableId) throws IOException, GoogleAuthException { + private boolean setPermission(Track track, String tableId) throws IOException, GoogleAuthException { boolean defaultTablePublic = PreferencesUtils.getBoolean(context, R.string.export_google_fusion_tables_public_key, PreferencesUtils.EXPORT_GOOGLE_FUSION_TABLES_PUBLIC_DEFAULT); @@ -218,6 +212,8 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { permission.setType("anyone"); permission.setValue(""); drive.permissions().insert(tableId, permission).execute(); + + shareUrl = SendFusionTablesUtils.getMapUrl(track, tableId); return true; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java index 989fd0db9..f7f47f995 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java @@ -42,13 +42,11 @@ public class SendFusionTablesUtils { * Gets the url to visualize a fusion table on a map. * * @param track the track + * @param tableId the table id * @return the url. */ - public static String getMapUrl(Track track) { - if (track == null - || track.getTripStatistics() == null - || track.getTableId() == null - || track.getTableId().length() == 0) { + public static String getMapUrl(Track track, String tableId) { + if (track == null || track.getTripStatistics() == null) { Log.e(TAG, "Invalid track"); return null; } @@ -57,7 +55,7 @@ public class SendFusionTablesUtils { int z; if (track.getNumberOfPoints() < 2) { // Use Google's latitude and longitude - latE6 = 37.423 * 1.E6; + latE6 = 37.423 * 1.E6; lonE6 = -122.084 * 1.E6; z = 2; } else { @@ -69,8 +67,7 @@ public class SendFusionTablesUtils { // We explicitly format with Locale.US because we need the latitude and // longitude to be formatted in a locale-independent manner. Specifically, // we need the decimal separator to be a period rather than a comma. - return String.format( - Locale.US, MAP_URL, track.getTableId(), latE6 / 1.E6, lonE6 / 1.E6, z); + return String.format(Locale.US, MAP_URL, tableId, latE6 / 1.E6, lonE6 / 1.E6, z); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java index a80c555df..11a5fb040 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java @@ -123,17 +123,6 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask { } } - @Override - protected void saveResult() { - Track track = myTracksProviderUtils.getTrack(trackId); - if (track == null) { - Log.d(TAG, "No track for " + trackId); - return; - } - track.setMapId(mapId); - myTracksProviderUtils.updateTrack(track); - } - @Override protected boolean performTask() { // Reset the per upload states @@ -222,6 +211,7 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask { + context.getString(R.string.send_google_by_my_tracks, "", ""); mapId = SendMapsUtils.createNewMap( track.getName(), description, defaultMapPublic, mapsClient, authToken); + shareUrl = MapsClient.buildMapUrl(mapId); } catch (ParseException e) { Log.d(TAG, "Unable to create a new map", e); return false; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java index f930039ae..2b811db42 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java @@ -15,7 +15,6 @@ */ package com.google.android.apps.mytracks.io.maps; -import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.io.gdata.maps.MapsClient; import com.google.android.apps.mytracks.io.gdata.maps.MapsFeature; @@ -46,22 +45,6 @@ public class SendMapsUtils { private SendMapsUtils() {} - /** - * Gets the Google Maps url for a track. - * - * @param track the track - * @return the url if available. - */ - public static String getMapUrl(Track track) { - if (track == null - || track.getMapId() == null - || track.getMapId().length() == 0) { - Log.e(TAG, "Invalid track"); - return null; - } - return MapsClient.buildMapUrl(track.getMapId()); - } - /** * Creates a new Google Map. * diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendAsyncTask.java index 2b69b269f..dd9fe1a0e 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendAsyncTask.java @@ -100,9 +100,6 @@ public abstract class AbstractSendAsyncTask extends AsyncTask