From 0f4f4edf6cab6167fafb9ec9dcec49d9064e06e2 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Thu, 10 Jul 2014 13:08:10 +0200 Subject: [PATCH] Fully disable cookie tracking by default, as before introducing OwnCloudClientManager; only SingleSessionManager tracks cookies --- src/com/owncloud/android/lib/common/OwnCloudClient.java | 2 +- .../owncloud/android/lib/common/SingleSessionManager.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java index 7058ff34..7b48bbc0 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudClient.java +++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java @@ -87,7 +87,7 @@ public class OwnCloudClient extends HttpClient { HttpVersion.HTTP_1_1); getParams().setCookiePolicy( - CookiePolicy.BROWSER_COMPATIBILITY); // to keep sessions + CookiePolicy.IGNORE_COOKIES); getParams().setParameter( PARAM_SINGLE_COOKIE_HEADER, // to avoid problems with some web servers PARAM_SINGLE_COOKIE_HEADER_VALUE); diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java index 690056ff..638362f6 100644 --- a/src/com/owncloud/android/lib/common/SingleSessionManager.java +++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java @@ -29,6 +29,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.commons.httpclient.cookie.CookiePolicy; + import android.accounts.Account; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; @@ -102,6 +104,9 @@ public class SingleSessionManager implements OwnCloudClientManager { account.getBaseUri(), context.getApplicationContext(), true); // TODO remove dependency on OwnCloudClientFactory + client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); + // enable cookie tracking + // Restore Cookies ?? AccountUtils.restoreCookies(accountName, client, context);