Merge pull request #126 from nextcloud/e2eUserAgent

set user agent / use it correctly
nextcloud · Feb 26, 2018 · 7452598 · 7452598
2 parents eaaa076 + 107c575
commit 7452598
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -473,4 +473,17 @@ public void setOwnCloudVersion(OwnCloudVersion version){
     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;
+    }
 }
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -40,8 +40,6 @@
 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 RemoteOperationResult execute(OwnCloudClient client, boolean useNextcloud
             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);
     }

diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -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.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 @@ private RemoteOperationResult createFolder(OwnCloudClient client) {
         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());