Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f4f4edf authored by David A. Velasco's avatar David A. Velasco
Browse files

Fully disable cookie tracking by default, as before introducing... 

Fully disable cookie tracking by default, as before introducing OwnCloudClientManager; only SingleSessionManager tracks cookies
parent 14d757ad

src/com/owncloud/android/lib/common/OwnCloudClient.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ public class OwnCloudClient extends HttpClient { 
        		HttpVersion.HTTP_1_1);

        		HttpVersion.HTTP_1_1);

        

        

        getParams().setCookiePolicy(

        getParams().setCookiePolicy(

        		CookiePolicy.BROWSER_COMPATIBILITY);	// to keep sessions

        		CookiePolicy.IGNORE_COOKIES);

        getParams().setParameter(

        getParams().setParameter(

        		PARAM_SINGLE_COOKIE_HEADER, 			// to avoid problems with some web servers

        		PARAM_SINGLE_COOKIE_HEADER, 			// to avoid problems with some web servers

        		PARAM_SINGLE_COOKIE_HEADER_VALUE);

        		PARAM_SINGLE_COOKIE_HEADER_VALUE);

src/com/owncloud/android/lib/common/SingleSessionManager.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ import java.util.HashMap; 
import java.util.Iterator;

import java.util.Iterator;

import java.util.Map;

import java.util.Map;





import org.apache.commons.httpclient.cookie.CookiePolicy;



import android.accounts.Account;

import android.accounts.Account;

import android.accounts.AuthenticatorException;

import android.accounts.AuthenticatorException;

import android.accounts.OperationCanceledException;

import android.accounts.OperationCanceledException;
@@ -102,6 +104,9 @@ public class SingleSessionManager implements OwnCloudClientManager { 
    				account.getBaseUri(), 

    				account.getBaseUri(), 

    				context.getApplicationContext(), 

    				context.getApplicationContext(), 

    				true);	// TODO remove dependency on OwnCloudClientFactory

    				true);	// TODO remove dependency on OwnCloudClientFactory

            client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);

            	// enable cookie tracking

            

    		

    		

    		// Restore Cookies ??

    		// Restore Cookies ??

    		AccountUtils.restoreCookies(accountName, client, context);		

    		AccountUtils.restoreCookies(accountName, client, context);