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

Commit 94ac3a93 authored by masensio's avatar masensio
Browse files

Fix bug: User agent: jakarta is shown when doing GET request

parent 43f6fe93

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

+14 −7
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import org.apache.commons.httpclient.URI; 
import org.apache.commons.httpclient.cookie.CookiePolicy;

import org.apache.commons.httpclient.methods.HeadMethod;

import org.apache.commons.httpclient.params.HttpMethodParams;

import org.apache.commons.httpclient.params.HttpParams;

import org.apache.http.HttpStatus;

import org.apache.http.params.CoreProtocolPNames;
@@ -66,6 +67,7 @@ public class OwnCloudClient extends HttpClient { 
    private int mInstanceNumber = 0;

    

    private Uri mBaseUri;

    private String mUserAgent;

    

    /**

     * Constructor
@@ -81,7 +83,8 @@ public class OwnCloudClient extends HttpClient { 
        mInstanceNumber = sIntanceCounter++;

        Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");



        getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);

        mUserAgent = userAgent;

        getParams().setParameter(HttpMethodParams.USER_AGENT, mUserAgent);

        getParams().setParameter(

        		CoreProtocolPNames.PROTOCOL_VERSION, 

        		HttpVersion.HTTP_1_1);
@@ -169,7 +172,7 @@ public class OwnCloudClient extends HttpClient { 
     * 

     * @param method                HTTP method request.

     * @param readTimeout           Timeout to set for data reception

     * @param conntionTimout    Timeout to set for connection establishment

     * @param connectionTimeout     Timeout to set for connection establishment

     */

    public int executeMethod(HttpMethodBase method, int readTimeout, int connectionTimeout) 

    		throws HttpException, IOException {
@@ -207,6 +210,10 @@ public class OwnCloudClient extends HttpClient { 
	            customRedirectionNeeded = mFollowRedirects;

	        }



            // Update User Agent

            HttpParams params = method.getParams();

            params.setParameter(HttpMethodParams.USER_AGENT, mUserAgent);



	        Log_OC.d(TAG + " #" + mInstanceNumber, "REQUEST " + 

	        		method.getName() + " " + method.getPath());
@@ -226,7 +233,7 @@ public class OwnCloudClient extends HttpClient { 
	        return status;

	        

        } catch (IOException e) {

        	Log_OC.d(TAG + " #" + mInstanceNumber, "Exception occured", e);

        	Log_OC.d(TAG + " #" + mInstanceNumber, "Exception occurred", e);

        	throw e;

        }

    }

src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import java.util.ArrayList; 


import org.apache.commons.httpclient.HttpStatus;

import org.apache.commons.httpclient.methods.GetMethod;

import org.apache.commons.httpclient.params.HttpMethodParams;

import org.apache.commons.httpclient.params.HttpParams;

import org.json.JSONException;

import org.json.JSONObject;
@@ -77,6 +79,10 @@ public class GetRemoteStatusOperation extends RemoteOperation { 
            get = new GetMethod(baseUrlSt + AccountUtils.STATUS_PATH);

            get.addRequestHeader(USER_AGENT_HEADER, getUserAgent());



            HttpParams params = get.getParams().getDefaultParams();

            params.setParameter(HttpMethodParams.USER_AGENT, getUserAgent());

            get.getParams().setDefaults(params);



            client.setFollowRedirects(false);

            boolean isRedirectToNonSecureConnection = false;

            int status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);