From 697922741078636629c35820c6cf8828e111fbcf Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 13 Feb 2012 10:02:29 -0800
Subject: [PATCH] merge heads

---
 MyTracks/AndroidManifest.xml                               | 4 ++--
 .../android/apps/mytracks/io/docs/SendDocsAsyncTask.java   | 7 +++----
 .../io/fusiontables/SendFusionTablesAsyncTask.java         | 2 +-
 .../android/apps/mytracks/io/maps/ChooseMapAsyncTask.java  | 3 ++-
 .../android/apps/mytracks/io/maps/SendMapsAsyncTask.java   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 38c6af30a..24126a949 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="37"
-          android:versionName="1.1.14">
+          android:versionCode="38"
+          android:versionName="1.1.15">
 
   <!-- Permissions to initialize service -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
index c31164387..dad8e3aea 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.docs;
 
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.gdata.GDataClientFactory;
@@ -181,10 +182,8 @@ public class SendDocsAsyncTask extends AbstractSendAsyncTask {
 
   @Override
   protected void invalidateToken() {
-    AccountManager.get(context).invalidateAuthToken(
-        documentsClient.getServiceName(), documentsAuthToken);
-    AccountManager.get(context).invalidateAuthToken(
-        spreadsheetsClient.getServiceName(), spreadsheetsAuthToken);
+    AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, documentsAuthToken);
+    AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, spreadsheetsAuthToken);
   }
 
   /**
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 d079cfa77..f00b13191 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
@@ -170,7 +170,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
 
   @Override
   protected void invalidateToken() {
-    AccountManager.get(context).invalidateAuthToken(SendFusionTablesUtils.SERVICE, authToken);
+    AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, authToken);
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
index a4a957197..985d4b0f2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.maps;
 
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.io.gdata.GDataClientFactory;
 import com.google.android.apps.mytracks.io.gdata.maps.MapFeatureEntry;
 import com.google.android.apps.mytracks.io.gdata.maps.MapsClient;
@@ -198,7 +199,7 @@ public class ChooseMapAsyncTask extends AsyncTask<Void, Integer, Boolean> {
       return false;
     }
 
-    AccountManager.get(context).invalidateAuthToken(MapsConstants.SERVICE_NAME, authToken);
+    AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, authToken);
     if (canRetry) {
       canRetry = false;
       return getMaps();
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 467b1cf62..632f76c3b 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
@@ -190,7 +190,7 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
 
   @Override
   protected void invalidateToken() {
-    AccountManager.get(context).invalidateAuthToken(MapsConstants.SERVICE_NAME, authToken);
+    AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, authToken);
   }
 
   /**