From 0f23df1b7b51e9be2034957a7fd47874f44d210c Mon Sep 17 00:00:00 2001
From: jabarros <jabarros@solidgear.es>
Date: Mon, 7 Jul 2014 14:36:01 +0200
Subject: [PATCH] Avoid log cookies

---
 .../android/lib/common/OwnCloudClient.java    | 33 +++++++++----------
 .../lib/common/accounts/AccountUtils.java     | 12 +++----
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index e6696ef0..7058ff34 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -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;
 	        
@@ -348,17 +347,17 @@ public class OwnCloudClient extends HttpClient {
         
 	}
 	
-	public String getCookiesString(){
-		Cookie[] cookies = getState().getCookies(); 
-		String cookiesString ="";
-		for (Cookie cookie: cookies) {
+	public String getCookiesString() {
+		Cookie[] cookies = getState().getCookies();
+		String cookiesString = "";
+		for (Cookie cookie : cookies) {
 			cookiesString = cookiesString + cookie.toString() + ";";
-			
-			logCookie(cookie);
+
+			// logCookie(cookie);
 		}
-		
+
 		return cookiesString;
-		
+
 	}
 
 	public int getConnectionTimeout() {
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index b061c2e5..591f93f7 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -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 );
 			}
 		}