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

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-02-13 10:02:29 -08:00
parent b10758cd96
commit 6979227410
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+2 -2
View File
@@ -17,8 +17,8 @@ limitations under the License.
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.maps.mytracks" package="com.google.android.maps.mytracks"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="37" android:versionCode="38"
android:versionName="1.1.14"> android:versionName="1.1.15">
<!-- Permissions to initialize service --> <!-- Permissions to initialize service -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
+3 -4
View File
@@ -15,6 +15,7 @@
*/ */
package com.google.android.apps.mytracks.io.docs; 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.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.io.gdata.GDataClientFactory; import com.google.android.apps.mytracks.io.gdata.GDataClientFactory;
@@ -181,10 +182,8 @@ public class SendDocsAsyncTask extends AbstractSendAsyncTask {
@Override @Override
protected void invalidateToken() { protected void invalidateToken() {
AccountManager.get(context).invalidateAuthToken( AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, documentsAuthToken);
documentsClient.getServiceName(), documentsAuthToken); AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, spreadsheetsAuthToken);
AccountManager.get(context).invalidateAuthToken(
spreadsheetsClient.getServiceName(), spreadsheetsAuthToken);
} }
/** /**
MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
@Override @Override
protected void invalidateToken() { protected void invalidateToken() {
AccountManager.get(context).invalidateAuthToken(SendFusionTablesUtils.SERVICE, authToken); AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, authToken);
} }
/** /**
MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapAsyncTask.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/ */
package com.google.android.apps.mytracks.io.maps; 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.GDataClientFactory;
import com.google.android.apps.mytracks.io.gdata.maps.MapFeatureEntry; import com.google.android.apps.mytracks.io.gdata.maps.MapFeatureEntry;
import com.google.android.apps.mytracks.io.gdata.maps.MapsClient; import com.google.android.apps.mytracks.io.gdata.maps.MapsClient;
@@ -198,7 +199,7 @@ public class ChooseMapAsyncTask extends AsyncTask<Void, Integer, Boolean> {
return false; return false;
} }
AccountManager.get(context).invalidateAuthToken(MapsConstants.SERVICE_NAME, authToken); AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, authToken);
if (canRetry) { if (canRetry) {
canRetry = false; canRetry = false;
return getMaps(); return getMaps();
MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
@Override @Override
protected void invalidateToken() { protected void invalidateToken() {
AccountManager.get(context).invalidateAuthToken(MapsConstants.SERVICE_NAME, authToken); AccountManager.get(context).invalidateAuthToken(Constants.ACCOUNT_TYPE, authToken);
} }
/** /**