From d701ee81bac2b239de544f9c77fa25b22385a656 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 15 Jul 2013 15:23:48 -0700 Subject: [PATCH] Bug fix: use a different request code for google play services --- .../android/apps/mytracks/AbstractSendToGoogleActivity.java | 1 + .../src/com/google/android/apps/mytracks/TrackListActivity.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java index 5765ed2ef..a1db37d8a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java @@ -80,6 +80,7 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv private static final int FUSION_TABLES_REQUEST_CODE = 1; private static final int SPREADSHEETS_REQUEST_CODE = 2; private static final int DELETE_REQUEST_CODE = 3; + protected static final int GOOGLE_PLAY_SERVICES_REQUEST_CODE = 4; private SendRequest sendRequest; diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index f924f57d3..dba007de9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java @@ -95,7 +95,6 @@ public class TrackListActivity extends AbstractSendToGoogleActivity implements EulaCaller, EnableSyncCaller, FileTypeCaller { private static final String TAG = TrackListActivity.class.getSimpleName(); - private static final int GOOGLE_PLAY_SERVICES_REQUEST_CODE = 0; private static final String[] PROJECTION = new String[] { TracksColumns._ID, TracksColumns.NAME, TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME, TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON,