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

Commit 0f23df1b authored by jabarros's avatar jabarros
Browse files

Avoid log cookies

parent e72fec72

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

+16 −17
Original line number Diff line number Diff line
@@ -43,14 +43,13 @@ import org.apache.commons.httpclient.params.HttpMethodParams; 
import org.apache.http.HttpStatus;

import org.apache.http.params.CoreProtocolPNames;



import android.net.Uri;

import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;

import com.owncloud.android.lib.common.accounts.AccountUtils;

import com.owncloud.android.lib.common.network.WebdavUtils;





import android.net.Uri;

import android.util.Log;



public class OwnCloudClient extends HttpClient {

	

    private static final String TAG = OwnCloudClient.class.getSimpleName();
@@ -189,8 +188,8 @@ public class OwnCloudClient extends HttpClient { 
	        Log.d(TAG + " #" + mInstanceNumber, "REQUEST " + 

	        		method.getName() + " " + method.getPath());

        

	        logCookiesAtRequest(method.getRequestHeaders(), "before");

	        logCookiesAtState("before");

//	        logCookiesAtRequest(method.getRequestHeaders(), "before");

//	        logCookiesAtState("before");

	        

	        int status = super.executeMethod(method);
@@ -198,9 +197,9 @@ public class OwnCloudClient extends HttpClient { 
	        	status = patchRedirection(status, method);

	        }



	        logCookiesAtRequest(method.getRequestHeaders(), "after");

	        logCookiesAtState("after");

	        logSetCookiesAtResponse(method.getResponseHeaders());

//	        logCookiesAtRequest(method.getRequestHeaders(), "after");

//	        logCookiesAtState("after");

//	        logSetCookiesAtResponse(method.getResponseHeaders());

	        

	        return status;
@@ -354,7 +353,7 @@ public class OwnCloudClient extends HttpClient { 
		for (Cookie cookie : cookies) {

			cookiesString = cookiesString + cookie.toString() + ";";



			logCookie(cookie);

			// logCookie(cookie);

		}



		return cookiesString;

src/com/owncloud/android/lib/common/accounts/AccountUtils.java

+6 −6
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ import java.io.IOException; 


import org.apache.commons.httpclient.Cookie;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.OwnCloudCredentials;

import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;

import com.owncloud.android.lib.resources.status.OwnCloudVersion;



import android.accounts.Account;

import android.accounts.AccountManager;

import android.accounts.AccountsException;
@@ -43,6 +38,11 @@ import android.content.Context; 
import android.net.Uri;

import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.OwnCloudCredentials;

import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;

import com.owncloud.android.lib.resources.status.OwnCloudVersion;



public class AccountUtils {

	

	private static final String TAG = AccountUtils.class.getSimpleName();
@@ -220,7 +220,7 @@ public class AccountUtils { 
			String cookiesString = client.getCookiesString();

			if (cookiesString != "") {

				ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); 

				Log.d(TAG, "Saving Cookies: "+ cookiesString );

				// Log.d(TAG, "Saving Cookies: "+ cookiesString );

			}

		}