flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Avoid log cookies

Browse Source
This commit is contained in:
jabarros 2014-07-07 14:36:01 +02:00
parent e72fec72a3
commit 0f23df1b7b
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/owncloud/android/lib/common/OwnCloudClient.java
View File

@ -43,14 +43,13 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.apache.http.params.CoreProtocolPNames; 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.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.accounts.AccountUtils;
import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.network.WebdavUtils;
import android.net.Uri;
import android.util.Log;
public class OwnCloudClient extends HttpClient { public class OwnCloudClient extends HttpClient {
private static final String TAG = OwnCloudClient.class.getSimpleName(); private static final String TAG = OwnCloudClient.class.getSimpleName();
@ -189,8 +188,8 @@ public class OwnCloudClient extends HttpClient {
Log.d(TAG + " #" + mInstanceNumber, "REQUEST " + Log.d(TAG + " #" + mInstanceNumber, "REQUEST " +
method.getName() + " " + method.getPath()); method.getName() + " " + method.getPath());
logCookiesAtRequest(method.getRequestHeaders(), "before"); // logCookiesAtRequest(method.getRequestHeaders(), "before");
logCookiesAtState("before"); // logCookiesAtState("before");
int status = super.executeMethod(method); int status = super.executeMethod(method);
@ -198,9 +197,9 @@ public class OwnCloudClient extends HttpClient {
status = patchRedirection(status, method); status = patchRedirection(status, method);
} }
logCookiesAtRequest(method.getRequestHeaders(), "after"); // logCookiesAtRequest(method.getRequestHeaders(), "after");
logCookiesAtState("after"); // logCookiesAtState("after");
logSetCookiesAtResponse(method.getResponseHeaders()); // logSetCookiesAtResponse(method.getResponseHeaders());
return status; return status;
@ -348,17 +347,17 @@ public class OwnCloudClient extends HttpClient {
} }
public String getCookiesString(){ public String getCookiesString() {
Cookie[] cookies = getState().getCookies(); Cookie[] cookies = getState().getCookies();
String cookiesString =""; String cookiesString = "";
for (Cookie cookie: cookies) { for (Cookie cookie : cookies) {
cookiesString = cookiesString + cookie.toString() + ";"; cookiesString = cookiesString + cookie.toString() + ";";
logCookie(cookie); // logCookie(cookie);
} }
return cookiesString; return cookiesString;
} }
public int getConnectionTimeout() { public int getConnectionTimeout() {

12
src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -29,11 +29,6 @@ import java.io.IOException;
import org.apache.commons.httpclient.Cookie; 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.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.AccountsException; import android.accounts.AccountsException;
@ -43,6 +38,11 @@ import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.util.Log; 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 { public class AccountUtils {
private static final String TAG = AccountUtils.class.getSimpleName(); private static final String TAG = AccountUtils.class.getSimpleName();
@ -220,7 +220,7 @@ public class AccountUtils {
String cookiesString = client.getCookiesString(); String cookiesString = client.getCookiesString();
if (cookiesString != "") { if (cookiesString != "") {
ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString);
Log.d(TAG, "Saving Cookies: "+ cookiesString ); // Log.d(TAG, "Saving Cookies: "+ cookiesString );
} }
} }