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

Unverified Commit 7452598e authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #126 from nextcloud/e2eUserAgent 

set user agent / use it correctly
parents eaaa0768 107c575d

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

+13 −0
Original line number Diff line number Diff line
@@ -473,4 +473,17 @@ public class OwnCloudClient extends HttpClient { 
    public OwnCloudVersion getOwnCloudVersion(){

        return mVersion;

    }



    public void setUseNextcloudUserAgent(boolean nextcloudUserAgent) {

        mUseNextcloudUserAgent = nextcloudUserAgent;



        String userAgent = nextcloudUserAgent ? OwnCloudClientManagerFactory.getNextcloudUserAgent() :

                OwnCloudClientManagerFactory.getUserAgent();



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

    }



    public boolean useNextcloudUserAgent() {

        return mUseNextcloudUserAgent;

    }

}

src/com/owncloud/android/lib/common/operations/RemoteOperation.java

+1 −7
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ import com.owncloud.android.lib.common.accounts.AccountUtils; 
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;

import com.owncloud.android.lib.common.utils.Log_OC;



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



import java.io.IOException;
@@ -142,11 +140,7 @@ public abstract class RemoteOperation implements Runnable { 
            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +

                    "OwnCloudClient");

		mClient = client;



        if (useNextcloudUserAgent) {

            mClient.getParams().setParameter(HttpMethodParams.USER_AGENT,

                    OwnCloudClientManagerFactory.getNextcloudUserAgent());

        }

        mClient.setUseNextcloudUserAgent(useNextcloudUserAgent);



        return run(client);

    }

src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java

+3 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


package com.owncloud.android.lib.resources.files;



import org.apache.jackrabbit.webdav.client.methods.MkColMethod;



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

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

import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -34,6 +32,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo 
import com.owncloud.android.lib.common.utils.Log_OC;

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



import org.apache.jackrabbit.webdav.client.methods.MkColMethod;





/**

 * Remote operation performing the creation of a new folder in the ownCloud server.
@@ -99,6 +99,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation { 
        MkColMethod mkcol = null;

        try {

            mkcol = new MkColMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));

            client.setUseNextcloudUserAgent(true);

            client.executeMethod(mkcol, READ_TIMEOUT, CONNECTION_TIMEOUT);

            result = new RemoteOperationResult(mkcol.succeeded(), mkcol);

            Log_OC.d(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage());