From 1605af1aa406eb18e88d68ce488531e04847019e Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 6 Nov 2012 14:09:22 -0800 Subject: [PATCH] fix various eclipse warnings --- .../com/google/android/apps/mytracks/ImportActivity.java | 2 +- .../mytracks/fragments/DeleteOneTrackDialogFragment.java | 8 ++++---- .../android/apps/mytracks/io/docs/SendDocsUtils.java | 3 ++- .../io/fusiontables/SendFusionTablesAsyncTask.java | 9 ++++++++- .../apps/mytracks/io/gdata/AndroidGDataClient.java | 8 +++----- .../android/apps/mytracks/io/gdata/QueryParamsImpl.java | 7 ++----- .../android/apps/mytracks/maps/TrackPathUtils.java | 1 - .../apps/mytracks/services/TrackRecordingService.java | 4 ++-- .../apps/mytracks/widgets/TrackWidgetProvider.java | 2 +- MyTracksLib/AndroidManifest.xml | 2 +- MyTracksTest/AndroidManifest.xml | 2 +- 11 files changed, 25 insertions(+), 23 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java index 6e67d6419..9f59dbc59 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java @@ -147,7 +147,7 @@ public class ImportActivity extends Activity { Intent intent = IntentUtils .newIntent(ImportActivity.this, TrackDetailActivity.class) .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, trackId); - TaskStackBuilder taskStackBuilder = TaskStackBuilder.from(ImportActivity.this); + TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(ImportActivity.this); taskStackBuilder.addNextIntent(intent); taskStackBuilder.startActivities(); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java index e2edbf998..fb5b76bfb 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java @@ -66,12 +66,12 @@ public class DeleteOneTrackDialogFragment extends DialogFragment { private DeleteOneTrackCaller caller; @Override - public void onAttach(Activity activity) { - super.onAttach(activity); + public void onAttach(Activity anActivity) { + super.onAttach(anActivity); try { - caller = (DeleteOneTrackCaller) activity; + caller = (DeleteOneTrackCaller) anActivity; } catch (ClassCastException e) { - throw new ClassCastException(activity.toString() + " must implement DeleteOneTrackCaller"); + throw new ClassCastException(anActivity.toString() + " must implement DeleteOneTrackCaller"); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java index af9af24b7..98f6e2a8c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java @@ -112,7 +112,8 @@ public class SendDocsUtils { throws IOException, ParseException, HttpException { GDataParser gDataParser = null; try { - String uri = String.format(Locale.US, GET_SPREADSHEET_BY_TITLE_URI, URLEncoder.encode(title)); + String uri = String.format( + Locale.US, GET_SPREADSHEET_BY_TITLE_URI, URLEncoder.encode(title, "UTF-8")); gDataParser = documentsClient.getParserForFeed(Entry.class, uri, authToken); gDataParser.init(); 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 3521d7041..cbe58ea16 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 @@ -39,6 +39,7 @@ import android.util.Log; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; @@ -397,7 +398,13 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { } GenericUrl url = new GenericUrl(FUSION_TABLES_BASE_URL); - String sql = SQL_KEY + URLEncoder.encode(query); + String sql; + try { + sql = SQL_KEY + URLEncoder.encode(query, "UTF-8"); + } catch (UnsupportedEncodingException e1) { + Log.d(TAG, "Unable to encode query", e1); + return false; + } ByteArrayInputStream inputStream = new ByteArrayInputStream(Strings.toBytesUtf8(sql)); InputStreamContent inputStreamContent = new InputStreamContent(null, inputStream); HttpRequest request; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/gdata/AndroidGDataClient.java b/MyTracks/src/com/google/android/apps/mytracks/io/gdata/AndroidGDataClient.java index 6d11a781c..f80f66d16 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/gdata/AndroidGDataClient.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/gdata/AndroidGDataClient.java @@ -139,14 +139,12 @@ public class AndroidGDataClient implements GDataClient { * @see GDataClient#encodeUri(java.lang.String) */ public String encodeUri(String uri) { - String encodedUri; + String encodedUri = null; try { encodedUri = URLEncoder.encode(uri, "UTF-8"); } catch (UnsupportedEncodingException uee) { - // should not happen. - Log.e("JakartaGDataClient", "UTF-8 not supported -- should not happen. " - + "Using default encoding.", uee); - encodedUri = URLEncoder.encode(uri); + // Should not happen + throw new IllegalStateException("Cannot encode " + uri, uee); } return encodedUri; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/gdata/QueryParamsImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/gdata/QueryParamsImpl.java index 57b4d171d..9964d560a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/gdata/QueryParamsImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/gdata/QueryParamsImpl.java @@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.io.gdata; import com.google.wireless.gdata.client.QueryParams; import android.text.TextUtils; -import android.util.Log; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -81,10 +80,8 @@ public class QueryParamsImpl extends QueryParams { try { encodedValue = URLEncoder.encode(value, "UTF-8"); } catch (UnsupportedEncodingException uee) { - // should not happen. - Log.w("QueryParamsImpl", "UTF-8 not supported -- should not happen. " - + "Using default encoding.", uee); - encodedValue = URLEncoder.encode(value); + // Should not happen + throw new IllegalStateException("Cannot encode " + value, uee); } sb.append(encodedValue); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathUtils.java b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathUtils.java index 3c74385ee..3c9ed0273 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathUtils.java @@ -41,7 +41,6 @@ public class TrackPathUtils { * @param color the path color * @param append true to append to the last path */ - @SuppressWarnings("unchecked") public static void addPath(GoogleMap googleMap, ArrayList paths, ArrayList points, int color, boolean append) { if (points.size() == 0) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java index ab612c11f..4c078c775 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java @@ -1018,7 +1018,7 @@ public class TrackRecordingService extends Service { if (isRecording() && !isPaused()) { Intent intent = IntentUtils.newIntent(this, TrackDetailActivity.class) .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, recordingTrackId); - TaskStackBuilder taskStackBuilder = TaskStackBuilder.from(this); + TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(this); taskStackBuilder.addNextIntent(intent); NotificationCompat.Builder builder = new NotificationCompat.Builder(this).setContentIntent( @@ -1026,7 +1026,7 @@ public class TrackRecordingService extends Service { .setContentText(getString(R.string.track_record_notification)) .setContentTitle(getString(R.string.my_tracks_app_name)).setOngoing(true) .setSmallIcon(R.drawable.my_tracks_notification_icon).setWhen(System.currentTimeMillis()); - startForegroundService(builder.getNotification()); + startForegroundService(builder.build()); } else { stopForegroundService(); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java index a823d2327..2c14eeac8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -264,7 +264,7 @@ public class TrackWidgetProvider extends AppWidgetProvider { } else { intent = IntentUtils.newIntent(context, TrackListActivity.class); } - TaskStackBuilder taskStackBuilder = TaskStackBuilder.from(context); + TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context); taskStackBuilder.addNextIntent(intent); PendingIntent pendingIntent = taskStackBuilder.getPendingIntent(0, 0); remoteViews.setOnClickPendingIntent(R.id.track_widget_stats_container, pendingIntent); diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml index 3797434cd..6179c7531 100644 --- a/MyTracksLib/AndroidManifest.xml +++ b/MyTracksLib/AndroidManifest.xml @@ -25,7 +25,7 @@ limitations under the License. for details on what should go here vs in the application project. -->