From cd3d20db072a7c57a8680fa80e03102371caa4e2 Mon Sep 17 00:00:00 2001
From: DerSchabi <chris.schabesberger@mailbox.org>
Date: Thu, 17 May 2018 09:45:54 +0200
Subject: [PATCH 001/133] add dav4droid support part1

---
 .gitignore                                    |   5 +-
 build.gradle                                  |   6 +
 sample_client/AndroidManifest.xml             |  29 +-
 sample_client/build.gradle                    |   4 +
 sample_client/res/layout/main.xml             | 195 +++----
 sample_client/res/values/strings.xml          |   1 -
 .../lib/sampleclient/MainActivity.java        | 399 +++----------
 .../common/operations/RemoteOperation.java    |  26 +
 .../owncloud/android/lib/refactor/Log_OC.java | 212 +++++++
 .../android/lib/refactor/OwnCloudContext.java |  50 ++
 .../android/lib/refactor/RemoteOperation.java |  50 ++
 .../lib/refactor/RemoteOperationResult.java   | 523 ++++++++++++++++++
 .../authentication/OwnCloudCredentials.java   |  44 ++
 .../OwnCloudAnonymousCredentials.java         |  29 +
 .../credentials/OwnCloudBasicCredentials.java |  66 +++
 .../OwnCloudBearerCredentials.java            |  69 +++
 .../OwnCloudSamlSsoCredentials.java           |  90 +++
 .../oauth/BearerAuthScheme.java               | 261 +++++++++
 .../oauth/BearerCredentials.java              | 102 ++++
 .../oauth/OAuth2ClientConfiguration.java      |  55 ++
 .../authentication/oauth/OAuth2Constants.java |  68 +++
 .../authentication/oauth/OAuth2GrantType.java |  46 ++
 .../authentication/oauth/OAuth2Provider.java  |  66 +++
 .../oauth/OAuth2ProvidersRegistry.java        | 122 ++++
 .../oauth/OAuth2QueryParser.java              |  75 +++
 .../oauth/OAuth2RequestBuilder.java           |  48 ++
 .../oauth/OAuth2ResponseParser.java           |  77 +++
 .../oauth/OwnCloudOAuth2Provider.java         |  94 ++++
 .../oauth/OwnCloudOAuth2RequestBuilder.java   | 153 +++++
 .../OAuth2GetAccessTokenOperation.java        | 136 +++++
 .../OAuth2RefreshAccessTokenOperation.java    | 134 +++++
 .../CertificateCombinedException.java         | 140 +++++
 .../OperationCancelledException.java          |  34 ++
 .../operations/PropfindOperation.java         |  18 +
 .../lib/refactor/utils/AccountTypeUtils.java  |  49 ++
 .../lib/refactor/utils/AccountUtils.java      | 321 +++++++++++
 .../refactor/utils/ErrorMessageParser.java    | 138 +++++
 .../InvalidCharacterExceptionParser.java      | 144 +++++
 .../files/ReadRemoteFolderOperation.java      |   3 +
 test_client/build.gradle                      |   4 +
 40 files changed, 3612 insertions(+), 474 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/refactor/Log_OC.java
 create mode 100644 src/com/owncloud/android/lib/refactor/OwnCloudContext.java
 create mode 100644 src/com/owncloud/android/lib/refactor/RemoteOperation.java
 create mode 100644 src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
 create mode 100644 src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java
 create mode 100644 src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java
 create mode 100644 src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
 create mode 100644 src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java
 create mode 100644 src/com/owncloud/android/lib/refactor/utils/AccountUtils.java
 create mode 100644 src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java
 create mode 100644 src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java

diff --git a/.gitignore b/.gitignore
index dd7c979e..d217bb39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,7 @@ tests/test_cases/local.properties
 proguard-project.txt
 sample_client/proguard-project.txt
 tests/proguard-project.txt
-tests/test_cases/proguard-project.txt
\ No newline at end of file
+tests/test_cases/proguard-project.txt
+
+# setup.xml login credentials
+sample_client/res/values/setup.xml
diff --git a/build.gradle b/build.gradle
index 3fe45e41..46e813f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,12 +14,14 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
 
 dependencies {
     api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
     api 'com.squareup.okhttp3:okhttp:3.10.0'
+    api 'com.gitlab.derSchabi:dav4android:dev2'
 }
 
 android {
@@ -52,4 +54,8 @@ android {
     lintOptions {
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index a2697540..c0885e36 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -24,27 +24,22 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.owncloud.android.lib.sampleclient"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
+      package="com.owncloud.android.lib.sampleclient"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="26"/>
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.Light.NoTitleBar">
-        <activity
-            android:name="MainActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait"
-            >
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+        <activity 	android:name="MainActivity"
+                  	android:label="@string/app_name"
+					android:screenOrientation="portrait"
+   					android:configChanges="orientation|keyboardHidden"
+                  >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index c0f96865..e61a1458 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -42,4 +42,8 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index 6a15c528..e743396b 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -24,150 +24,99 @@
  -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
 
-    <EditText
-        android:id="@+id/server_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/button_check_server"
-        android:layout_toStartOf="@+id/button_check_server"
-        android:ems="10"
-        android:hint="Server address (with http or https)"
-        android:inputType="textPersonName"/>
-
-    <Button
-        android:id="@+id/button_check_server"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/server_address"
-        android:layout_alignBottom="@+id/server_address"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:onClick="onClickHandler"
-        android:text="@string/check_server"/>
-
     <Button
         android:id="@+id/button_refresh"
+        style="@style/ButtonStyle"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:text="@string/refresh"
+        android:onClick="onClickHandler"
+        />
+
+    <ListView
+        android:id="@+id/list_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+		android:layout_below="@+id/button_refresh"
+        android:layout_above="@+id/button_upload"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
-        android:layout_below="@id/server_address"
-        android:layout_marginTop="10dp"
-        android:onClick="onClickHandler"
-        android:text="@string/refresh"/>
+        >
+    </ListView>
 
     <Button
         android:id="@+id/button_upload"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/ButtonStyle"
         android:layout_alignParentLeft="true"
-        android:layout_below="@id/button_refresh"
-        android:layout_marginTop="10dp"
+        android:layout_above="@+id/frame"
+        android:text="@string/upload"
         android:onClick="onClickHandler"
-        android:text="@string/upload"/>
+        />
+
+    <TextView
+        android:id="@+id/upload_progress"
+        style="@style/ProgressStyle"
+        android:layout_below="@id/list_view"
+        android:layout_above="@id/frame"
+        android:layout_toRightOf="@id/button_upload"
+        android:layout_toLeftOf="@+id/button_delete_remote"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:text="0%"
+        />
 
     <Button
-        android:id="@+id/button_download"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/button_upload"
-        android:layout_marginTop="10dp"
+        android:id="@id/button_delete_remote"
+        style="@style/ButtonStyle"
+        android:layout_alignParentRight="true"
+        android:layout_above="@id/frame"
+        android:text="@string/delete_remote_file"
         android:onClick="onClickHandler"
-        android:text="@string/download"/>
+        />
+
+    <FrameLayout
+        android:id="@id/frame"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/frame_height"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_above="@+id/button_download"
+        >
+    </FrameLayout>
 
     <Button
-        android:id="@+id/button_delete_remote"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:id="@id/button_download"
+        style="@style/ButtonStyle"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_below="@id/button_download"
-        android:layout_marginTop="10dp"
+        android:text="@string/download"
         android:onClick="onClickHandler"
-        android:text="@string/delete_remote_file"/>
+        />
 
-    <!--<ListView-->
-    <!--android:id="@+id/list_view"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignParentLeft="true"-->
-    <!--android:layout_alignParentRight="true"-->
-    <!--android:layout_below="@+id/button_refresh"-->
-    <!--android:visibility="invisible">-->
-    <!--</ListView>-->
+    <TextView
+        android:id="@+id/download_progress"
+        style="@style/ProgressStyle"
+        android:layout_below="@id/frame"
+        android:layout_alignParentBottom="true"
+        android:layout_toRightOf="@id/button_download"
+        android:layout_toLeftOf="@+id/button_delete_local"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:text="0%"
+        />
 
-    <!--<TextView-->
-    <!--android:id="@+id/upload_progress"-->
-    <!--style="@style/ProgressStyle"-->
-    <!--android:layout_above="@id/frame"-->
-    <!--android:layout_below="@id/list_view"-->
-    <!--android:layout_toLeftOf="@+id/button_delete_remote"-->
-    <!--android:layout_toRightOf="@id/button_upload"-->
-    <!--android:enabled="false"-->
-    <!--android:gravity="center"-->
-    <!--android:text="0%"-->
-    <!--android:textSize="14sp"-->
-    <!--android:visibility="invisible"/>-->
-
-    <!--<Button-->
-    <!--android:id="@id/button_delete_remote"-->
-    <!--style="@style/ButtonStyle"-->
-    <!--android:layout_above="@id/frame"-->
-    <!--android:layout_alignParentRight="true"-->
-    <!--android:enabled="false"-->
-    <!--android:onClick="onClickHandler"-->
-    <!--android:text="@string/delete_remote_file"-->
-    <!--android:visibility="invisible"/>-->
-
-    <!--<FrameLayout-->
-    <!--android:id="@id/frame"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="@dimen/frame_height"-->
-    <!--android:layout_alignParentLeft="true"-->
-    <!--android:layout_alignParentRight="true"-->
-    <!--android:layout_above="@+id/button_download"-->
-    <!--&gt;-->
-    <!--</FrameLayout>-->
-
-    <!--<Button-->
-    <!--android:id="@id/button_download"-->
-    <!--style="@style/ButtonStyle"-->
-    <!--android:layout_alignParentBottom="true"-->
-    <!--android:layout_alignParentLeft="true"-->
-    <!--android:enabled="false"-->
-    <!--android:onClick="onClickHandler"-->
-    <!--android:text="@string/download"-->
-    <!--android:visibility="invisible"/>-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/download_progress"-->
-    <!--style="@style/ProgressStyle"-->
-    <!--android:layout_alignParentBottom="true"-->
-    <!--android:layout_below="@id/frame"-->
-    <!--android:layout_toLeftOf="@+id/button_delete_local"-->
-    <!--android:layout_toRightOf="@id/button_download"-->
-    <!--android:enabled="false"-->
-    <!--android:gravity="center"-->
-    <!--android:text="0%"-->
-    <!--android:textSize="14sp"-->
-    <!--android:visibility="invisible"/>-->
-
-    <!--<Button-->
-    <!--android:id="@id/button_delete_local"-->
-    <!--style="@style/ButtonStyle"-->
-    <!--android:layout_alignParentBottom="true"-->
-    <!--android:layout_alignParentRight="true"-->
-    <!--android:enabled="false"-->
-    <!--android:onClick="onClickHandler"-->
-    <!--android:text="@string/delete_local_file"-->
-    <!--android:visibility="invisible"/>-->
+    <Button
+        android:id="@id/button_delete_local"
+        style="@style/ButtonStyle"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:text="@string/delete_local_file"
+        android:onClick="onClickHandler"
+        />
 
 </RelativeLayout>
 
diff --git a/sample_client/res/values/strings.xml b/sample_client/res/values/strings.xml
index 6ef9c46c..0703961c 100644
--- a/sample_client/res/values/strings.xml
+++ b/sample_client/res/values/strings.xml
@@ -26,7 +26,6 @@
 <resources>
     <string name="app_name">ownCloud Sample Client</string>
     <string name="refresh">Refresh</string>
-    <string name="check_server">Check server</string>
     <string name="upload">Upload</string>
     <string name="delete_remote_file">Delete remote file</string>
     <string name="download">Download</string>
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index e87dbc4c..6ac5efd8 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -1,7 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   @author David González Verdugo
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,35 +24,6 @@
 
 package com.owncloud.android.lib.sampleclient;
 
-import android.app.Activity;
-import android.content.res.AssetManager;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -63,30 +32,35 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Credentials;
-import okhttp3.Headers;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.FileUtils;
+
+import android.app.Activity;
+import android.content.res.AssetManager;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
 
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
 	private static String LOG_TAG = MainActivity.class.getCanonicalName();
-
-	private static final String NODE_VERSION = "version";
-	private static final String WEBDAV_PATH_4_0 = "/remote.php/webdav/";
-	private static final String NEW_WEBDAV_PATH = "/remote.php/dav/files/";
-	private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
-	private static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
-	private static final String AUTHORIZATION_HEADER = "Authorization";
-	private static final String USER_AGENT_HEADER = "User-Agent";
-	private static final String CONTENT_TYPE_HEADER = "Content-Type";
-	private static final String USER_AGENT_VALUE = "Mozilla/5.0 (Android) ownCloud-android/2.7.0";
-	private static final String CONTENT_TYPE_VALUE = "multipart/form-data";
 	
 	private Handler mHandler;
 	
@@ -95,10 +69,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	private FilesArrayAdapter mFilesAdapter;
 	
 	private View mFrame;
-
-	private OkHttpClient mOkHttpClient;
-
-	private String mCredentials;
 	
     /** Called when the activity is first created. */
     @Override
@@ -118,7 +88,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		);
     	
     	mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
-//    	((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
+    	((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
     	
     	// TODO move to background thread or task
     	AssetManager assets = getAssets();
@@ -140,14 +110,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			Toast.makeText(this, R.string.error_copying_sample_file, Toast.LENGTH_SHORT).show();
 			Log.e(LOG_TAG, getString(R.string.error_copying_sample_file), e);
 		}
-
-		((TextView) findViewById(R.id.server_address)).setText(getString(R.string.server_base_url));
-
-		mOkHttpClient = new OkHttpClient();
-
-		mCredentials = Credentials.basic(getString(R.string.username), getString(R.string.password));
 		
-//		mFrame = findViewById(R.id.frame);
+		mFrame = findViewById(R.id.frame);
     }
     
     
@@ -163,264 +127,63 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     
     public void onClickHandler(View button) {
     	switch (button.getId())	{
-			case R.id.button_check_server:
-				startCheck();
-				break;
 	    	case R.id.button_refresh:
 	    		startRefresh();
 	    		break;
 	    	case R.id.button_upload:
 	    		startUpload();
 	    		break;
-			case R.id.button_download:
-	    		startDownload();
-	    		break;
 	    	case R.id.button_delete_remote:
 	    		startRemoteDeletion();
 	    		break;
-//	    	case R.id.button_delete_local:
-//	    		startLocalDeletion();
-//	    		break;
+	    	case R.id.button_download:
+	    		startDownload();
+	    		break;
+	    	case R.id.button_delete_local:
+	    		startLocalDeletion();
+	    		break;
 			default:
 	    		Toast.makeText(this, R.string.youre_doing_it_wrong, Toast.LENGTH_SHORT).show();
     	}
     }
 
-    private void startCheck() {
-
-		if (!validServerAddress()) return;
-
-		Request request = new Request.Builder()
-				.url(getString(R.string.server_base_url) + "/status.php")
-				.get()
-				.build();
-
-		mOkHttpClient.newCall(request).enqueue(new Callback() {
-
-			@Override public void onResponse(Call call, final Response response) throws IOException {
-
-				if (!response.isSuccessful()) {
-
-					showMessage("Response not successful with code: " + response.code());
-
-					throw new IOException("Unexpected code " + response);
-				}
-
-				try { // Successful response
-
-					String jsonData = response.body().string();
-
-					JSONObject Jobject = new JSONObject(jsonData);
-
-					final String serverVersion = Jobject.get("version").toString();
-
-					showMessage("Server with version " + serverVersion + " detected");
-
-				} catch (JSONException e) {
-					e.printStackTrace();
-				}
-
-				Headers responseHeaders = response.headers();
-				for (int i = 0, size = responseHeaders.size(); i < size; i++) {
-					System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
-				}
-			}
-
-			@Override public void onFailure(Call call, final IOException e) {
-				e.printStackTrace();
-				showMessage("Something was wrong: " + e.toString());
-			}
-		});
-	}
-
-	private void startRefresh() {
-
-//		Let's first use OKHttp with the new endpoint without depending on our library operations
-
-//    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
-//    	refreshOperation.execute(mClient, this, mHandler);
-
-		if (!validServerAddress()) return;
-
-		final Request request = new Request.Builder()
-				.url(getString(R.string.server_base_url) + NEW_WEBDAV_PATH + getString(R.string.username))
-				.addHeader(AUTHORIZATION_HEADER, mCredentials)
-				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
-				.method("PROPFIND", null)
-				.build();
-
-		mOkHttpClient.newCall(request).enqueue(new Callback() {
-
-			@Override public void onResponse(Call call, final Response response) throws IOException {
-
-				if (!response.isSuccessful()) {
-
-					showMessage("Response not successful with code: " + response.code());
-
-					throw new IOException("Unexpected code " + response);
-
-				} else { // Successful response
-
-					final String propFindResult = response.body().string();
-
-					showMessage(propFindResult);
-
-					Headers responseHeaders = response.headers();
-					for (int i = 0, size = responseHeaders.size(); i < size; i++) {
-						System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
-					}
-				}
-			}
-
-			@Override public void onFailure(Call call, IOException e) {
-				showMessage("Something was wrong: " + e.toString());
-				e.printStackTrace();
-			}
-		});
-	}
+    private void startRefresh() {
+    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
+    	refreshOperation.execute(mClient, this, mHandler);
+    }
     
     private void startUpload() {
-
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-    	final File fileToUpload = upFolder.listFiles()[0];
+    	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
     	String mimeType = getString(R.string.sample_file_mimetype);
 
-		MediaType mediaType = MediaType.parse(mimeType);
-
 		// Get the last modification date of the file from the file system
 		Long timeStampLong = fileToUpload.lastModified()/1000;
 		String timeStamp = timeStampLong.toString();
 
-//		Let's first use OKHttp with the new endpoint without depending on our library operations
-
-//    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
-//    	uploadOperation.addDatatransferProgressListener(this);
-//    	uploadOperation.execute(mClient, this, mHandler);
-
-		if (!validServerAddress()) return;
-
-		RequestBody requestBody = RequestBody.create(mediaType, fileToUpload);
-
-		final Request request = new Request.Builder()
-				.url(getString(R.string.server_base_url) + NEW_WEBDAV_PATH + getString(R.string.username) + remotePath)
-				.addHeader(AUTHORIZATION_HEADER, mCredentials)
-				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
-                .addHeader(CONTENT_TYPE_HEADER, CONTENT_TYPE_VALUE)
-				.addHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()))
-				.addHeader(OC_X_OC_MTIME_HEADER, timeStamp)
-				.put(requestBody)
-				.build();
-
-		mOkHttpClient.newCall(request).enqueue(new Callback() {
-
-			@Override public void onResponse(Call call, final Response response) throws IOException {
-
-				if (!response.isSuccessful()) {
-
-					showMessage("Response not successful with code: " + response.code());
-
-					throw new IOException("Unexpected code " + response);
-
-				} else { // Successful response
-
-					showMessage("Successful upload of " + fileToUpload.getName());
-				}
-			}
-
-			@Override public void onFailure(Call call, IOException e) {
-				e.printStackTrace();
-				showMessage("Something was wrong: " + e.toString());
-			}
-		});
+    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
+    	uploadOperation.addDatatransferProgressListener(this);
+    	uploadOperation.execute(mClient, this, mHandler);
     }
 
-	private void startDownload() {
-		File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
-		downFolder.mkdir();
-		File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-		final File fileToUpload = upFolder.listFiles()[0];
-		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
-
-//		Let's first use OKHttp with the new endpoint without depending on our library operations
-
-//		DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
-//		downloadOperation.addDatatransferProgressListener(this);
-//		downloadOperation.execute(mClient, this, mHandler);
-
-		if (!validServerAddress()) return;
-
-		final Request request = new Request.Builder()
-				.url(getString(R.string.server_base_url) + NEW_WEBDAV_PATH + getString(R.string.username) + remotePath)
-				.addHeader(AUTHORIZATION_HEADER, mCredentials)
-				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
-				.get()
-				.build();
-
-
-		mOkHttpClient.newCall(request).enqueue(new Callback() {
-
-			@Override public void onResponse(Call call, final Response response) throws IOException {
-
-				if (!response.isSuccessful()) {
-
-					showMessage("Response not successful with code: " + response.code());
-
-					throw new IOException("Unexpected code " + response);
-
-				} else { // Successful response
-
-					showMessage("Successful download of " + fileToUpload.getName() + " although local file " +
-							"won't be created in this stage");
-				}
-			}
-
-			@Override public void onFailure(Call call, IOException e) {
-				e.printStackTrace();
-				showMessage("Something was wrong: " + e.toString());
-			}
-		});
-	}
-
-	private void startRemoteDeletion() {
+    private void startRemoteDeletion() {
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-    	final File fileToUpload = upFolder.listFiles()[0];
+    	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
+    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
+    	removeOperation.execute(mClient, this, mHandler);
+    }
 
-//		Let's first use OKHttp with the new endpoint without depending on our library operations
-//    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
-//    	removeOperation.execute(mClient, this, mHandler);
-
-		if (!validServerAddress()) return;
-
-		final Request request = new Request.Builder()
-				.url(getString(R.string.server_base_url) + NEW_WEBDAV_PATH + getString(R.string.username) + remotePath)
-				.addHeader(AUTHORIZATION_HEADER, mCredentials)
-				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
-				.delete()
-				.build();
-
-		mOkHttpClient.newCall(request).enqueue(new Callback() {
-
-			@Override public void onResponse(Call call, final Response response) throws IOException {
-
-				if (!response.isSuccessful()) {
-
-					showMessage("Response not successful with code: " + response.code());
-
-					throw new IOException("Unexpected code " + response);
-
-				} else { // Successful response
-
-					showMessage("Successful deletion of " + fileToUpload.getName());
-				}
-			}
-
-			@Override public void onFailure(Call call, IOException e) {
-				e.printStackTrace();
-				showMessage("Something was wrong: " + e.toString());
-			}
-		});
+    private void startDownload() {
+    	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
+    	downFolder.mkdir();
+    	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+    	File fileToUpload = upFolder.listFiles()[0];
+    	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
+    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
+    	downloadOperation.addDatatransferProgressListener(this);
+    	downloadOperation.execute(mClient, this, mHandler);
     }
     
     @SuppressWarnings("deprecation")
@@ -430,8 +193,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     	if (!downloadedFile.delete() && downloadedFile.exists()) {
     		Toast.makeText(this, R.string.error_deleting_local_file, Toast.LENGTH_SHORT).show();
     	} else {
-//    		((TextView) findViewById(R.id.download_progress)).setText("0%");
-//    		findViewById(R.id.frame).setBackgroundDrawable(null);
+    		((TextView) findViewById(R.id.download_progress)).setText("0%");
+    		findViewById(R.id.frame).setBackgroundDrawable(null);
     	}
     }
 
@@ -480,10 +243,10 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 	private void onSuccessfulRemoteDeletion(RemoveRemoteFileOperation operation, RemoteOperationResult result) {
 		startRefresh();
-//		TextView progressView = (TextView) findViewById(R.id.upload_progress);
-//		if (progressView != null) {
-//			progressView.setText("0%");
-//		}
+		TextView progressView = (TextView) findViewById(R.id.upload_progress);
+		if (progressView != null) {
+			progressView.setText("0%");
+		}
 	}
 
 	@SuppressWarnings("deprecation")
@@ -503,11 +266,11 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
             @Override
             public void run() {
 				TextView progressView = null;
-//				if (upload) {
-//					progressView = (TextView) findViewById(R.id.upload_progress);
-//				} else {
-//					progressView = (TextView) findViewById(R.id.download_progress);
-//				}
+				if (upload) {
+					progressView = (TextView) findViewById(R.id.upload_progress);
+				} else {
+					progressView = (TextView) findViewById(R.id.download_progress);
+				}
 				if (progressView != null) {
 	    			progressView.setText(Long.toString(percentage) + "%");
 				}
@@ -515,32 +278,4 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         });
 	}
 
-	private boolean validServerAddress() {
-
-    	String serverAddress = ((TextView) findViewById(R.id.server_address)).getText().toString();
-
-		if (serverAddress.equals("") || (!serverAddress.contains("http://") && !serverAddress.contains("https://"))) {
-			showToastMessage("Introduce a proper server address with http/https");
-			return false;
-		}
-		return true;
-	}
-
-	private void showMessage(final String message) {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-
-				showToastMessage(message);
-			}
-		});
-	}
-
-	private void showToastMessage(String message) {
-		Toast toast = Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG);
-
-		toast.setGravity(Gravity.CENTER, 0, 0);
-
-		toast.show();
-	}
 }
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index a8de3938..32be1215 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -39,6 +39,8 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.IOException;
 
+import okhttp3.OkHttpClient;
+
 
 /**
  * Operation which execution involves one or several interactions with an ownCloud server.
@@ -77,6 +79,11 @@ public abstract class RemoteOperation implements Runnable {
      */
     private OwnCloudClient mClient = null;
 
+    /**
+     * Object to interact with the remote server
+     */
+    private OkHttpClient mHttpClient = null;
+
     /**
      * Callback object to notify about the execution of the remote operation
      */
@@ -142,6 +149,25 @@ public abstract class RemoteOperation implements Runnable {
         return runOperation();
     }
 
+    /**
+     * Synchronously executes the remote operation
+     *
+     * Do not call this method from the main thread.
+     *
+     * @param client Client object to reach an ownCloud server during the execution of
+     *               the operation.
+     * @return Result of the operation.
+     */
+    public RemoteOperationResult execute(OkHttpClient client, Context context) {
+        if (client == null)
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+                    "OwnCloudClient");
+        mHttpClient = client;
+        mContext = context;
+
+        return runOperation();
+    }
+
 
     /**
      * Asynchronously executes the remote operation
diff --git a/src/com/owncloud/android/lib/refactor/Log_OC.java b/src/com/owncloud/android/lib/refactor/Log_OC.java
new file mode 100644
index 00000000..53499f30
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/Log_OC.java
@@ -0,0 +1,212 @@
+package com.owncloud.android.lib.refactor;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import android.util.Log;
+
+
+public class Log_OC {
+    private static final String SIMPLE_DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";
+    private static final String LOG_FOLDER_NAME = "log";
+    private static final long MAX_FILE_SIZE = 1000000; // 1MB
+
+    private static String mOwncloudDataFolderLog = "owncloud_log";
+
+    private static File mLogFile;
+    private static File mFolder;
+    private static BufferedWriter mBuf;
+
+    private static String[] mLogFileNames = {"currentLog.txt", "olderLog.txt"};
+
+    private static boolean isMaxFileSizeReached = false;
+    private static boolean isEnabled = false;
+
+    public static void setLogDataFolder(String logFolder){
+    	mOwncloudDataFolderLog = logFolder;
+    }
+
+    public static void i(String TAG, String message){
+        Log.i(TAG, message);
+        appendLog(TAG+" : "+ message);
+    }
+
+    public static void d(String TAG, String message){
+        Log.d(TAG, message);
+        appendLog(TAG + " : " + message);
+    }
+    public static void d(String TAG, String message, Exception e) {
+        Log.d(TAG, message, e);
+        appendLog(TAG + " : " + message + " Exception : "+ e.getStackTrace());
+    }
+    public static void e(String TAG, String message){
+        Log.e(TAG, message);
+        appendLog(TAG + " : " + message);
+    }
+    
+    public static void e(String TAG, String message, Throwable e) {
+        Log.e(TAG, message, e);
+        appendLog(TAG+" : " + message +" Exception : " + e.getStackTrace());
+    }
+    
+    public static void v(String TAG, String message){
+        Log.v(TAG, message);
+        appendLog(TAG+" : "+ message);
+    }
+    
+    public static void w(String TAG, String message) {
+        Log.w(TAG, message);
+        appendLog(TAG+" : "+ message);
+    }
+    
+    public static void wtf(String TAG, String message) {
+        Log.wtf(TAG, message);
+        appendLog(TAG+" : "+ message);
+    }
+
+    /**
+     * Start doing logging
+     * @param storagePath : directory for keeping logs
+     */
+    synchronized public static void startLogging(String storagePath) {
+		String logPath = storagePath + File.separator +
+			mOwncloudDataFolderLog + File.separator + LOG_FOLDER_NAME;
+        mFolder = new File(logPath);
+        mLogFile = new File(mFolder + File.separator + mLogFileNames[0]);
+
+        boolean isFileCreated = false;
+
+        if (!mFolder.exists()) {
+            mFolder.mkdirs();
+            isFileCreated = true;
+            Log.d("LOG_OC", "Log file created");
+        }
+
+        try { 
+
+            // Create the current log file if does not exist
+            mLogFile.createNewFile();
+            mBuf = new BufferedWriter(new FileWriter(mLogFile, true));
+            isEnabled = true;
+
+            if (isFileCreated) {
+                appendPhoneInfo();
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if(mBuf != null) {
+                try {
+                    mBuf.close();
+                } catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    synchronized public static void stopLogging() {
+        try {
+			if (mBuf != null)
+                mBuf.close();
+            isEnabled = false;
+
+            mLogFile = null;
+            mFolder = null;
+            mBuf = null;
+            isMaxFileSizeReached = false;
+            isEnabled = false;
+
+        } catch (IOException e) {
+            // Because we are stopping logging, we only log to Android console.
+            Log.e("OC_Log", "Closing log file failed: ", e);
+        } catch (Exception e) {
+            // This catch should never fire because we do null check on mBuf.
+            // But just for the sake of stability let's log this odd situation.
+            // Because we are stopping logging, we only log to Android console.
+            Log.e("OC_Log", "Stopping logging failed: ", e);
+        }
+    }
+
+    /**
+     * Delete history logging
+     */
+    public static void deleteHistoryLogging() {
+        File folderLogs = new File(mFolder + File.separator);
+        if(folderLogs.isDirectory()){
+            String[] myFiles = folderLogs.list();
+            for (int i=0; i<myFiles.length; i++) {
+                File myFile = new File(folderLogs, myFiles[i]);
+                myFile.delete();
+            }
+        }
+    }
+    
+    /**
+     * Append the info of the device
+     */
+    private static void appendPhoneInfo() {
+        appendLog("Model : " + android.os.Build.MODEL);
+        appendLog("Brand : " + android.os.Build.BRAND);
+        appendLog("Product : " + android.os.Build.PRODUCT);
+        appendLog("Device : " + android.os.Build.DEVICE);
+        appendLog("Version-Codename : " + android.os.Build.VERSION.CODENAME);
+        appendLog("Version-Release : " + android.os.Build.VERSION.RELEASE);
+    }
+    
+    /**
+     * Append to the log file the info passed
+     * @param text : text for adding to the log file
+     */
+    synchronized private static void appendLog(String text) {
+
+        if (isEnabled) {
+
+            if (isMaxFileSizeReached) {
+
+                // Move current log file info to another file (old logs)
+                File olderFile = new File(mFolder + File.separator + mLogFileNames[1]);
+                if (mLogFile.exists()) {
+                    mLogFile.renameTo(olderFile);
+                }
+
+                // Construct a new file for current log info
+                mLogFile = new File(mFolder + File.separator + mLogFileNames[0]);
+                isMaxFileSizeReached = false;
+            }
+
+	        String timeStamp = new SimpleDateFormat(SIMPLE_DATE_FORMAT).format(Calendar.getInstance().getTime());
+
+	        try {
+	            mBuf = new BufferedWriter(new FileWriter(mLogFile, true));
+	            mBuf.newLine();
+	            mBuf.write(timeStamp);
+	            mBuf.newLine();
+	            mBuf.write(text);
+	            mBuf.newLine();
+	        } catch (IOException e) {
+	            e.printStackTrace();
+	        } finally {
+                try {
+                    mBuf.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            // Check if current log file size is bigger than the max file size defined
+            if (mLogFile.length() > MAX_FILE_SIZE) {
+                isMaxFileSizeReached = true;
+            }
+        }
+    }
+
+    public static String[] getLogFileNames() {
+        return mLogFileNames;
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java b/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
new file mode 100644
index 00000000..7259b861
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
@@ -0,0 +1,50 @@
+package com.owncloud.android.lib.refactor;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+
+
+public class OwnCloudContext {
+    private static final String TAG = OwnCloudContext.class.toString();
+
+    public static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
+    public static final String STATUS_PATH = "/status.php";
+    public static final String FILES_WEB_PATH = "/index.php/apps/files";
+
+    private static final int MAX_REDIRECTIONS_COUNT = 3;
+    private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
+    private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
+    private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
+    private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
+
+    private OwnCloudCredentials mCredentials = null;
+    private Uri mBaseUri;
+
+    public class Builder {
+        OwnCloudContext ocContext = new OwnCloudContext();
+
+        public Builder setCredentials(OwnCloudCredentials credentials) {
+            ocContext.mCredentials = credentials;
+            return this;
+        }
+
+        public Builder setBaseUri(Uri baseUri) {
+            ocContext.mBaseUri = baseUri;
+            return this;
+        }
+
+        public OwnCloudContext build() {
+            return ocContext;
+        }
+    }
+
+
+    public OwnCloudCredentials getCredentials() {
+        return mCredentials;
+    }
+
+    public Uri getBaseUri() {
+        return mBaseUri;
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
new file mode 100644
index 00000000..3fdbac5c
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -0,0 +1,50 @@
+package com.owncloud.android.lib.refactor;
+
+import com.owncloud.android.lib.refactor.RemoteOperation;
+
+import java.util.Map;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
+public abstract class RemoteOperation {
+    private final OwnCloudContext mContext;
+    private static OkHttpClient httpClient = null;
+
+    protected RemoteOperation(OwnCloudContext context) {
+        mContext = context;
+
+        if(httpClient == null) {
+            httpClient = new OkHttpClient.Builder()
+                    .followRedirects(false)
+                    .build();
+        }
+    }
+
+    public abstract RemoteOperationResult exec();
+
+    public OwnCloudContext getOCContext() {
+        return mContext;
+    }
+
+    public OkHttpClient getClient() {
+        return httpClient;
+    }
+
+    public Request.Builder getRequestBuilder() {
+        Request.Builder builder = new Request.Builder();
+
+        for(Map.Entry<String, String> header
+                : mContext.getCredentials().getCredentialHeaders().entrySet()) {
+            builder.addHeader(header.getKey(), header.getValue());
+        }
+
+        //TODO: Remove this part once SAML is obsolet
+        final String credentialCookie = mContext.getCredentials().getCredentialCookie();
+        if(credentialCookie == null) {
+            builder.addHeader("Cookie", credentialCookie);
+        }
+
+        return builder;
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java b/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
new file mode 100644
index 00000000..6f09bcba
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
@@ -0,0 +1,523 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor;
+
+import android.accounts.Account;
+import android.accounts.AccountsException;
+
+import com.owncloud.android.lib.refactor.utils.AccountUtils;
+import com.owncloud.android.lib.refactor.exceptions.CertificateCombinedException;
+import com.owncloud.android.lib.refactor.exceptions.OperationCancelledException;
+import com.owncloud.android.lib.refactor.utils.ErrorMessageParser;
+import com.owncloud.android.lib.refactor.utils.InvalidCharacterExceptionParser;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.JSONException;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLException;
+
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+import okhttp3.Headers;
+import okhttp3.Request;
+import okhttp3.Response;
+
+
+/**
+ * The result of a remote operation required to an ownCloud server.
+ * <p/>
+ * Provides a common classification of remote operation results for all the
+ * application.
+ *
+ * @author David A. Velasco
+ */
+public class RemoteOperationResult implements Serializable {
+
+    /**
+     * Generated - should be refreshed every time the class changes!!
+     */
+    private static final long serialVersionUID = 4968939884332372230L;
+
+    private static final String TAG = RemoteOperationResult.class.getSimpleName();
+
+    public enum ResultCode {
+        OK,
+        OK_SSL,
+        OK_NO_SSL,
+        UNHANDLED_HTTP_CODE,
+        UNAUTHORIZED,
+        FILE_NOT_FOUND,
+        INSTANCE_NOT_CONFIGURED,
+        UNKNOWN_ERROR,
+        WRONG_CONNECTION,
+        TIMEOUT,
+        INCORRECT_ADDRESS,
+        HOST_NOT_AVAILABLE,
+        NO_NETWORK_CONNECTION,
+        SSL_ERROR,
+        SSL_RECOVERABLE_PEER_UNVERIFIED,
+        BAD_OC_VERSION,
+        CANCELLED,
+        INVALID_LOCAL_FILE_NAME,
+        INVALID_OVERWRITE,
+        CONFLICT,
+        OAUTH2_ERROR,
+        SYNC_CONFLICT,
+        LOCAL_STORAGE_FULL,
+        LOCAL_STORAGE_NOT_MOVED,
+        LOCAL_STORAGE_NOT_COPIED,
+        OAUTH2_ERROR_ACCESS_DENIED,
+        QUOTA_EXCEEDED,
+        ACCOUNT_NOT_FOUND,
+        ACCOUNT_EXCEPTION,
+        ACCOUNT_NOT_NEW,
+        ACCOUNT_NOT_THE_SAME,
+        INVALID_CHARACTER_IN_NAME,
+        SHARE_NOT_FOUND,
+        LOCAL_STORAGE_NOT_REMOVED,
+        FORBIDDEN,
+        SHARE_FORBIDDEN,
+        SPECIFIC_FORBIDDEN,
+        OK_REDIRECT_TO_NON_SECURE_CONNECTION,
+        INVALID_MOVE_INTO_DESCENDANT,
+        INVALID_COPY_INTO_DESCENDANT,
+        PARTIAL_MOVE_DONE,
+        PARTIAL_COPY_DONE,
+        SHARE_WRONG_PARAMETER,
+        WRONG_SERVER_RESPONSE,
+        INVALID_CHARACTER_DETECT_IN_SERVER,
+        DELAYED_FOR_WIFI,
+        LOCAL_FILE_NOT_FOUND,
+        SERVICE_UNAVAILABLE,
+        SPECIFIC_SERVICE_UNAVAILABLE,
+        SPECIFIC_UNSUPPORTED_MEDIA_TYPE
+    }
+
+    private boolean mSuccess = false;
+    private int mHttpCode = -1;
+    private String mHttpPhrase = null;
+    private Exception mException = null;
+    private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
+    private String mRedirectedLocation;
+    private ArrayList<String> mAuthenticate = new ArrayList<>();
+    private String mLastPermanentLocation = null;
+
+    private ArrayList<Object> mData;
+
+    /**
+     * Public constructor from result code.
+     *
+     * To be used when the caller takes the responsibility of interpreting the result of a {@link RemoteOperation}
+     *
+     * @param code {@link ResultCode} decided by the caller.
+     */
+    public RemoteOperationResult(ResultCode code) {
+        mCode = code;
+        mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL ||
+                code == ResultCode.OK_NO_SSL ||
+                code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION);
+        mData = null;
+    }
+
+    /**
+     * Public constructor from exception.
+     *
+     * To be used when an exception prevented the end of the {@link RemoteOperation}.
+     *
+     * Determines a {@link ResultCode} depending on the type of the exception.
+     *
+     * @param e Exception that interrupted the {@link RemoteOperation}
+     */
+    public RemoteOperationResult(Exception e) {
+        mException = e;
+
+        if (e instanceof OperationCancelledException) {
+            mCode = ResultCode.CANCELLED;
+
+        } else if (e instanceof SocketException) {
+            mCode = ResultCode.WRONG_CONNECTION;
+
+        } else if (e instanceof SocketTimeoutException) {
+            mCode = ResultCode.TIMEOUT;
+
+        } else if (e instanceof SocketTimeoutException) {
+            mCode = ResultCode.TIMEOUT;
+
+        } else if (e instanceof MalformedURLException) {
+            mCode = ResultCode.INCORRECT_ADDRESS;
+
+        } else if (e instanceof UnknownHostException) {
+            mCode = ResultCode.HOST_NOT_AVAILABLE;
+
+        } else if (e instanceof AccountUtils.AccountNotFoundException) {
+            mCode = ResultCode.ACCOUNT_NOT_FOUND;
+
+        } else if (e instanceof AccountsException) {
+            mCode = ResultCode.ACCOUNT_EXCEPTION;
+
+        } else if (e instanceof SSLException || e instanceof RuntimeException) {
+            CertificateCombinedException se = getCertificateCombinedException(e);
+            if (se != null) {
+                mException = se;
+                if (se.isRecoverable()) {
+                    mCode = ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
+                }
+            } else if (e instanceof RuntimeException) {
+                mCode = ResultCode.HOST_NOT_AVAILABLE;
+
+            } else {
+                mCode = ResultCode.SSL_ERROR;
+            }
+
+        } else if (e instanceof FileNotFoundException) {
+            mCode = ResultCode.LOCAL_FILE_NOT_FOUND;
+
+        } else {
+            mCode = ResultCode.UNKNOWN_ERROR;
+        }
+
+    }
+
+    /**
+     * Public constructor from separate elements of an HTTP or DAV response.
+     *
+     * To be used when the result needs to be interpreted from the response of an HTTP/DAV method.
+     *
+     * Determines a {@link ResultCode} from the already executed method received as a parameter. Generally,
+     * will depend on the HTTP code and HTTP response headers received. In some cases will inspect also the
+     * response body
+     *
+     * @param success
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    public RemoteOperationResult(boolean success, Request request, Response response) throws IOException {
+        this(success, response.code(), HttpStatus.getStatusText(response.code()), response.headers());
+
+        if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
+
+            String bodyResponse = response.body().string();
+            // do not get for other HTTP codes!; could not be available
+
+            if (bodyResponse != null && bodyResponse.length() > 0) {
+                InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
+                InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
+                try {
+                    if (xmlParser.parseXMLResponse(is)) {
+                        mCode = ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER;
+                    }
+
+                } catch (Exception e) {
+                    Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
+                    // mCode stays as set in this(success, httpCode, headers)
+                }
+            }
+        }
+
+        // before
+        switch (mHttpCode) {
+            case HttpStatus.SC_FORBIDDEN:
+                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_FORBIDDEN);
+                break;
+            case HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE:
+                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE);
+                break;
+            case HttpStatus.SC_SERVICE_UNAVAILABLE:
+                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_SERVICE_UNAVAILABLE);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Parse the error message included in the body response, if any, and set the specific result
+     * code
+     */
+
+    /**
+     * Parse the error message included in the body response, if any, and set the specific result
+     * code
+     *
+     * @param request okHttp request
+     * @param response okHttp respnse
+     * @param resultCode our own custom result code
+     * @throws IOException
+     */
+    private void parseErrorMessageAndSetCode(Request request, Response response, ResultCode resultCode)
+            throws IOException {
+
+        String bodyResponse = response.body().string();
+
+        if (bodyResponse != null && bodyResponse.length() > 0) {
+            InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
+            ErrorMessageParser xmlParser = new ErrorMessageParser();
+            try {
+                String errorMessage = xmlParser.parseXMLResponse(is);
+                if (errorMessage != "" && errorMessage != null) {
+                    mCode = resultCode;
+                    mHttpPhrase = errorMessage;
+                }
+            } catch (Exception e) {
+                Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
+                // mCode stays as set in this(success, httpCode, headers)
+            }
+        }
+    }
+
+    /**
+     * Public constructor from separate elements of an HTTP or DAV response.
+     *
+     * To be used when the result needs to be interpreted from HTTP response elements that could come from
+     * different requests (WARNING: black magic, try to avoid).
+     *
+     * Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
+     *
+     * @param success     The operation was considered successful or not.
+     * @param httpCode    HTTP status code returned by an HTTP/DAV method.
+     * @param httpPhrase  HTTP status line phrase returned by an HTTP/DAV method
+     * @param headers     HTTP response header returned by an HTTP/DAV method
+     */
+    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Headers headers) {
+        this(success, httpCode, httpPhrase);
+        for (Map.Entry<String, List<String>> header : headers.toMultimap().entrySet()) {
+            if ("location".equals(header.getKey().toLowerCase())) {
+                mRedirectedLocation = header.getValue().get(0);
+                continue;
+            }
+            if ("www-authenticate".equals(header.getKey().toLowerCase())) {
+                mAuthenticate.add(header.getValue().get(0).toLowerCase());
+            }
+        }
+        if (isIdPRedirection()) {
+            mCode = ResultCode.UNAUTHORIZED;    // overrides default ResultCode.UNKNOWN
+        }
+    }
+
+    /**
+     * Private constructor for results built interpreting a HTTP or DAV response.
+     *
+     * Determines a {@link ResultCode} depending of the type of the exception.
+     *
+     * @param success    Operation was successful or not.
+     * @param httpCode   HTTP status code returned by the HTTP/DAV method.
+     * @param httpPhrase HTTP status line phrase returned by the HTTP/DAV method
+     */
+    private RemoteOperationResult(boolean success, int httpCode, String httpPhrase) {
+        mSuccess = success;
+        mHttpCode = httpCode;
+        mHttpPhrase = httpPhrase;
+        mCode = success
+                ? ResultCode.OK
+                : getCodeFromStatus(httpCode);
+    }
+
+    private ResultCode getCodeFromStatus(int status) {
+        switch (status) {
+            case HttpStatus.SC_UNAUTHORIZED: return ResultCode.UNAUTHORIZED;
+            case HttpStatus.SC_FORBIDDEN: return ResultCode.FORBIDDEN;
+            case HttpStatus.SC_NOT_FOUND: return ResultCode.FILE_NOT_FOUND;
+            case HttpStatus.SC_CONFLICT: return ResultCode.CONFLICT;
+            case HttpStatus.SC_INTERNAL_SERVER_ERROR: return ResultCode.INSTANCE_NOT_CONFIGURED;
+            case HttpStatus.SC_SERVICE_UNAVAILABLE: return ResultCode.SERVICE_UNAVAILABLE;
+            case HttpStatus.SC_INSUFFICIENT_STORAGE: return ResultCode.QUOTA_EXCEEDED;
+            default:
+                Log_OC.d(TAG,
+                        "RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " +
+                                mHttpCode + " " + mHttpPhrase
+                );
+                return ResultCode.UNHANDLED_HTTP_CODE;
+        }
+    }
+
+    public void setData(ArrayList<Object> files) {
+        mData = files;
+    }
+
+    public ArrayList<Object> getData() {
+        return mData;
+    }
+
+    public boolean isSuccess() {
+        return mSuccess;
+    }
+
+    public boolean isCancelled() {
+        return mCode == ResultCode.CANCELLED;
+    }
+
+    public int getHttpCode() {
+        return mHttpCode;
+    }
+
+    public String getHttpPhrase() {
+        return mHttpPhrase;
+    }
+
+    public ResultCode getCode() {
+        return mCode;
+    }
+
+    public Exception getException() {
+        return mException;
+    }
+
+    public boolean isSslRecoverableException() {
+        return mCode == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
+    }
+
+    public boolean isRedirectToNonSecureConnection() {
+        return mCode == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION;
+    }
+
+    private CertificateCombinedException getCertificateCombinedException(Exception e) {
+        CertificateCombinedException result = null;
+        if (e instanceof CertificateCombinedException) {
+            return (CertificateCombinedException) e;
+        }
+        Throwable cause = mException.getCause();
+        Throwable previousCause = null;
+        while (cause != null && cause != previousCause &&
+                !(cause instanceof CertificateCombinedException)) {
+            previousCause = cause;
+            cause = cause.getCause();
+        }
+        if (cause != null && cause instanceof CertificateCombinedException) {
+            result = (CertificateCombinedException) cause;
+        }
+        return result;
+    }
+
+    public String getLogMessage() {
+
+        if (mException != null) {
+            if(mException instanceof OperationCancelledException)
+                return "Operation cancelled by the caller";
+            if(mException instanceof SocketException) return "Socket exception";
+            if(mException instanceof SocketTimeoutException) return "Socket timeout exception";
+            if(mException instanceof MalformedURLException) return "Malformed URL exception";
+            if(mException instanceof UnknownHostException) return "Unknown host exception";
+            if(mException instanceof CertificateCombinedException) {
+                if (((CertificateCombinedException) mException).isRecoverable())
+                    return "SSL recoverable exception";
+                else
+                    return "SSL exception";
+
+            }
+            if(mException instanceof SSLException) return "SSL exception";
+            if(mException instanceof DavException) return "Unexpected WebDAV exception";
+            if(mException instanceof HttpException) return "HTTP violation";
+            if(mException instanceof IOException) return "Unrecovered transport exception";
+            if(mException instanceof AccountUtils.AccountNotFoundException) {
+                Account failedAccount =
+                        ((AccountUtils.AccountNotFoundException) mException).getFailedAccount();
+                return mException.getMessage() + " (" +
+                        (failedAccount != null ? failedAccount.name : "NULL") + ")";
+
+            }
+            if (mException instanceof AccountsException) return "Exception while using account";
+            if (mException instanceof JSONException) return "JSON exception";
+
+            return "Unexpected exception";
+        }
+
+        if(mCode == ResultCode.INSTANCE_NOT_CONFIGURED)
+            return "The ownCloud server is not configured!";
+        if(mCode == ResultCode.NO_NETWORK_CONNECTION) return "No network connection";
+        if(mCode == ResultCode.BAD_OC_VERSION)
+            return "No valid ownCloud version was found at the server";
+        if(mCode == ResultCode.LOCAL_STORAGE_FULL) return "Local storage full";
+        if(mCode == ResultCode.LOCAL_STORAGE_NOT_MOVED)
+            return "Error while moving file to final directory";
+        if(mCode == ResultCode.ACCOUNT_NOT_NEW)
+            return "Account already existing when creating a new one";
+        if(mCode == ResultCode.INVALID_CHARACTER_IN_NAME)
+            return "The file name contains an forbidden character";
+        if(mCode == ResultCode.FILE_NOT_FOUND) return "Local file does not exist";
+        if(mCode == ResultCode.SYNC_CONFLICT) return "Synchronization conflict";
+
+        return "Operation finished with HTTP status code " + mHttpCode + " (" +
+                (isSuccess() ? "success" : "fail") + ")";
+
+    }
+
+    public boolean isServerFail() {
+        return (mHttpCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR);
+    }
+
+    public boolean isException() {
+        return (mException != null);
+    }
+
+    public boolean isTemporalRedirection() {
+        return (mHttpCode == 302 || mHttpCode == 307);
+    }
+
+    public String getRedirectedLocation() {
+        return mRedirectedLocation;
+    }
+
+    public boolean isIdPRedirection() {
+        return (mRedirectedLocation != null &&
+                (mRedirectedLocation.toUpperCase().contains("SAML") ||
+                        mRedirectedLocation.toLowerCase().contains("wayf")));
+    }
+
+    /**
+     * Checks if is a non https connection
+     *
+     * @return boolean true/false
+     */
+    public boolean isNonSecureRedirection() {
+        return (mRedirectedLocation != null && !(mRedirectedLocation.toLowerCase().startsWith("https://")));
+    }
+
+    public ArrayList<String> getAuthenticateHeaders() {
+        return mAuthenticate;
+    }
+
+    public String getLastPermanentLocation() {
+        return mLastPermanentLocation;
+    }
+
+    public void setLastPermanentLocation(String lastPermanentLocation) {
+        mLastPermanentLocation = lastPermanentLocation;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
new file mode 100644
index 00000000..e0550ec8
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
@@ -0,0 +1,44 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public interface OwnCloudCredentials {
+
+    Map<String, String> getCredentialHeaders();
+
+    //TODO: Remove this once SAML is obsolet
+    default String getCredentialCookie() {
+        return null;
+    }
+
+    String getUsername();
+    String getAuthToken();
+    boolean authTokenCanBeRefreshed();
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
new file mode 100644
index 00000000..28ef3cce
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
@@ -0,0 +1,29 @@
+package com.owncloud.android.lib.refactor.authentication.credentials;
+
+
+import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+
+import java.util.HashMap;
+import java.util.Map;
+public class OwnCloudAnonymousCredentials implements OwnCloudCredentials {
+
+    @Override
+    public Map<String, String> getCredentialHeaders() {
+        return new HashMap<>(0);
+    }
+
+    @Override
+    public String getUsername() {
+        return "";
+    }
+
+    @Override
+    public String getAuthToken() {
+        return null;
+    }
+
+    @Override
+    public boolean authTokenCanBeRefreshed() {
+        return false;
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
new file mode 100644
index 00000000..a6813da0
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
@@ -0,0 +1,66 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+package com.owncloud.android.lib.refactor.authentication.credentials;
+
+import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import okhttp3.Authenticator;
+import okhttp3.Credentials;
+
+public class OwnCloudBasicCredentials implements OwnCloudCredentials {
+
+    private String mUsername;
+    private String mPassword;
+
+    public OwnCloudBasicCredentials(String username, String password) {
+        mUsername = username != null ? username : "";
+        mPassword = password != null ? password : "";
+    }
+
+    @Override
+    public Map<String, String> getCredentialHeaders() {
+        HashMap<String, String> header = new HashMap<>(1);
+        header.put("Authorization", Credentials.basic(mUsername, mPassword));
+        return header;
+    }
+
+    @Override
+    public String getUsername() {
+        return mUsername;
+    }
+
+    @Override
+    public String getAuthToken() {
+        return mPassword;
+    }
+
+    @Override
+    public boolean authTokenCanBeRefreshed() {
+        return false;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
new file mode 100644
index 00000000..2b7b4fe8
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
@@ -0,0 +1,69 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+package com.owncloud.android.lib.refactor.authentication.credentials;
+
+
+
+import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import okhttp3.Authenticator;
+
+public class OwnCloudBearerCredentials implements OwnCloudCredentials {
+
+    private String mUsername;
+
+    private String mAccessToken;
+
+    public OwnCloudBearerCredentials(String username, String accessToken) {
+        mUsername = username != null ? username : "";
+        mAccessToken = accessToken != null ? accessToken : "";
+    }
+
+    @Override
+    public Map<String, String> getCredentialHeaders() {
+        HashMap<String, String> header = new HashMap<>(1);
+        header.put("Authorization", "Bearer " + mAccessToken);
+        return header;
+    }
+
+    @Override
+    public String getUsername() {
+        // not relevant for authentication, but relevant for informational purposes
+        return mUsername;
+    }
+
+    @Override
+    public String getAuthToken() {
+        return mAccessToken;
+    }
+
+    @Override
+    public boolean authTokenCanBeRefreshed() {
+        return true;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
new file mode 100644
index 00000000..5bd8e3a8
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
@@ -0,0 +1,90 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+package com.owncloud.android.lib.refactor.authentication.credentials;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+
+import org.apache.commons.httpclient.Cookie;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
+
+    private final String mUsername;
+    private final String mSessionCookie;
+    private final Uri mBaseUrl;
+
+    public OwnCloudSamlSsoCredentials(String username, String sessionCookie, Uri baseUrl) {
+        mUsername = username != null ? username : "";
+        mSessionCookie = sessionCookie != null ? sessionCookie : "";
+        mBaseUrl = baseUrl;
+    }
+
+    @Override
+    public String getCredentialCookie() {
+
+        String[] rawCookies = mSessionCookie.split(";");
+        StringBuilder processedCookies = new StringBuilder();
+        Cookie cookie = null;
+        for (final String rawCookie : rawCookies) {
+            int equalPos = rawCookie.indexOf('=');
+            if (equalPos >= 0) {
+                cookie = new Cookie();
+                cookie.setName(rawCookie.substring(0, equalPos));
+                cookie.setValue(rawCookie.substring(equalPos + 1));
+                cookie.setDomain(mBaseUrl.getHost());    // VERY IMPORTANT
+                cookie.setPath(mBaseUrl.getPath());    // VERY IMPORTANT
+                processedCookies.append(cookie.toExternalForm() + ";");
+            }
+        }
+        return processedCookies.toString();
+    }
+
+    @Override
+    public Map<String, String> getCredentialHeaders() {
+        return new HashMap<>(0);
+    }
+
+    @Override
+    public String getUsername() {
+        // not relevant for authentication, but relevant for informational purposes
+        return mUsername;
+    }
+
+    @Override
+    public String getAuthToken() {
+        return mSessionCookie;
+    }
+
+    @Override
+    public boolean authTokenCanBeRefreshed() {
+        return false;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java
new file mode 100644
index 00000000..b37fdfd7
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java
@@ -0,0 +1,261 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.auth.AuthChallengeParser;
+import org.apache.commons.httpclient.auth.AuthScheme;
+import org.apache.commons.httpclient.auth.AuthenticationException;
+import org.apache.commons.httpclient.auth.InvalidCredentialsException;
+import org.apache.commons.httpclient.auth.MalformedChallengeException;
+
+import java.util.Map;
+
+
+/**
+ * Bearer authentication scheme as defined in RFC 6750.
+ * 
+ * @author David A. Velasco
+ */
+
+public class BearerAuthScheme implements AuthScheme /*extends RFC2617Scheme*/ {
+    
+    private static final String TAG = BearerAuthScheme.class.getSimpleName();
+
+    public static final String AUTH_POLICY = "Bearer";
+    
+    /** Whether the bearer authentication process is complete */
+    private boolean mComplete;
+    
+    /** Authentication parameter map */
+    @SuppressWarnings("rawtypes")
+	private Map mParams = null;
+    
+    
+    /**
+     * Default constructor for the bearer authentication scheme.
+     */
+    public BearerAuthScheme() {
+        mComplete = false;
+    }
+
+    /**
+     * Constructor for the basic authentication scheme.
+     * 
+     * @param   challenge                       Authentication challenge
+     * 
+     * @throws  MalformedChallengeException     Thrown if the authentication challenge is malformed
+     */
+    public BearerAuthScheme(final String challenge) throws MalformedChallengeException {
+        processChallenge(challenge);
+        mComplete = true;
+    }
+
+    /**
+     * Returns textual designation of the bearer authentication scheme.
+     * 
+     * @return "Bearer"
+     */
+    public String getSchemeName() {
+        return "bearer";
+    }
+
+    /**
+     * Processes the Bearer challenge.
+     *  
+     * @param   challenge                   The challenge string
+     * 
+     * @throws MalformedChallengeException  Thrown if the authentication challenge is malformed
+     */
+    public void processChallenge(String challenge) throws MalformedChallengeException {
+        String s = AuthChallengeParser.extractScheme(challenge);
+        if (!s.equalsIgnoreCase(getSchemeName())) {
+            throw new MalformedChallengeException(
+              "Invalid " + getSchemeName() + " challenge: " + challenge); 
+        }
+        mParams = AuthChallengeParser.extractParams(challenge);
+        mComplete = true;
+    }
+
+    /**
+     * Tests if the Bearer authentication process has been completed.
+     * 
+     * @return 'true' if Bearer authorization has been processed, 'false' otherwise.
+     */
+    public boolean isComplete() {
+        return this.mComplete;
+    }
+
+    /**
+     * Produces bearer authorization string for the given set of 
+     * {@link Credentials}.
+     * 
+     * @param   credentials                     The set of credentials to be used for authentication
+     * @param   method                          Method name is ignored by the bearer authentication scheme
+     * @param   uri                             URI is ignored by the bearer authentication scheme
+     * @throws  InvalidCredentialsException     If authentication credentials are not valid or not applicable 
+     *                                          for this authentication scheme
+     * @throws  AuthenticationException         If authorization string cannot be generated due to an authentication failure
+     * @return  A bearer authorization string
+     */
+    public String authenticate(Credentials credentials, String method, String uri) throws AuthenticationException {
+        BearerCredentials bearer;
+        try {
+            bearer = (BearerCredentials) credentials;
+        } catch (ClassCastException e) {
+            throw new InvalidCredentialsException(
+             "Credentials cannot be used for bearer authentication: "
+              + credentials.getClass().getName());
+        }
+        return BearerAuthScheme.authenticate(bearer);
+    }
+
+
+    /**
+     * Returns 'false'. Bearer authentication scheme is request based.
+     *
+     * @return 'false'.
+     */
+    public boolean isConnectionBased() {
+        return false;
+    }
+
+    /**
+     * Produces bearer authorization string for the given set of {@link Credentials}.
+     *
+     * @param   credentials                     The set of credentials to be used for authentication
+     * @param   method                          The method being authenticated
+     * @throws  InvalidCredentialsException     If authentication credentials are not valid or not applicable for this authentication
+     *                                          scheme.
+     * @throws AuthenticationException         If authorization string cannot be generated due to an authentication failure.
+     *
+     * @return a basic authorization string
+     */
+    public String authenticate(Credentials credentials, HttpMethod method) throws AuthenticationException {
+        if (method == null) {
+            throw new IllegalArgumentException("Method may not be null");
+        }
+        BearerCredentials bearer = null;
+        try {
+            bearer = (BearerCredentials) credentials;
+        } catch (ClassCastException e) {
+            throw new InvalidCredentialsException(
+                    "Credentials cannot be used for bearer authentication: "
+                    + credentials.getClass().getName());
+        }
+        return BearerAuthScheme.authenticate(
+            bearer,
+            method.getParams().getCredentialCharset());
+    }
+
+    /**
+     * Returns a bearer Authorization header value for the given
+     * {@link BearerCredentials}.
+     *
+     * @param   credentials     The credentials to encode.
+     *
+     * @return                  A bearer authorization string
+     */
+    public static String authenticate(BearerCredentials credentials) {
+        return authenticate(credentials, "ISO-8859-1");
+    }
+
+    /**
+     * Returns a bearer Authorization header value for the given
+     * {@link BearerCredentials} and charset.
+     * 
+     * @param   credentials         The credentials to encode.
+     * @param   charset             The charset to use for encoding the credentials
+     * 
+     * @return                      A bearer authorization string
+     * 
+     * @since 3.0
+     */
+    public static String authenticate(BearerCredentials credentials, String charset) {
+
+        if (credentials == null) {
+            throw new IllegalArgumentException("Credentials may not be null"); 
+        }
+        if (charset == null || charset.length() == 0) {
+            throw new IllegalArgumentException("charset may not be null or empty");
+        }
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(credentials.getAccessToken());
+
+        return "Bearer " + buffer.toString();
+    }
+
+    /**
+     * Returns a String identifying the authentication challenge.  This is
+     * used, in combination with the host and port to determine if
+     * authorization has already been attempted or not.  Schemes which
+     * require multiple requests to complete the authentication should
+     * return a different value for each stage in the request.
+     * 
+     * Additionally, the ID should take into account any changes to the
+     * authentication challenge and return a different value when appropriate.
+     * For example when the realm changes in basic authentication it should be
+     * considered a different authentication attempt and a different value should
+     * be returned.
+     * 
+     * This method simply returns the realm for the challenge.
+     * 
+     * @return String       a String identifying the authentication challenge.
+     */
+    @Override
+    public String getID() {
+        return getRealm();
+    }
+
+    /**
+     * Returns authentication parameter with the given name, if available.
+     * 
+     * @param   name    The name of the parameter to be returned
+     * 
+     * @return          The parameter with the given name
+     */
+    @Override
+    public String getParameter(String name) {
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name may not be null"); 
+        }
+        if (mParams == null) {
+            return null;
+        }
+        return (String) mParams.get(name.toLowerCase());
+    }
+
+    /**
+     * Returns authentication realm. The realm may not be null.
+     * 
+     * @return  The authentication realm
+     */
+    @Override
+    public String getRealm() {
+        return getParameter("realm");
+    }
+    
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java
new file mode 100644
index 00000000..6771a6af
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java
@@ -0,0 +1,102 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+import org.apache.commons.httpclient.util.LangUtils;
+
+/**
+ *
+ * @author David A. Velasco
+ */
+public class BearerCredentials {
+
+    
+    private String mAccessToken;
+    
+    
+    /**
+     * The constructor with the bearer token
+     *
+     * @param token     The bearer token
+     */
+    public BearerCredentials(String token) {
+        /*if (token == null) {
+            throw new IllegalArgumentException("Bearer token may not be null");            
+        }*/
+        mAccessToken = (token == null) ? "" : token;
+    }
+
+
+    /**
+     * Returns the access token
+     *
+     * @return      The access token
+     */
+    public String getAccessToken() {
+        return mAccessToken;
+    }
+
+
+    /**
+     * Get this object string.
+     *
+     * @return  The access token
+     */
+    public String toString() {
+        return mAccessToken;
+    }
+
+    /**
+     * Does a hash of the access token.
+     *
+     * @return The hash code of the access token
+     */
+    public int hashCode() {
+        int hash = LangUtils.HASH_SEED;
+        hash = LangUtils.hashCode(hash, mAccessToken);
+        return hash;
+    }
+
+    /**
+     * These credentials are assumed equal if accessToken is the same.
+     *
+     * @param   o   The other object to compare with.
+     *
+     * @return      'True' if the object is equivalent.
+     */
+    public boolean equals(Object o) {
+        if (o == null) return false;
+        if (this == o) return true;
+        if (this.getClass().equals(o.getClass())) {
+            BearerCredentials that = (BearerCredentials) o;
+            if (LangUtils.equals(mAccessToken, that.mAccessToken)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
+
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java
new file mode 100644
index 00000000..62b01f33
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java
@@ -0,0 +1,55 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+public class OAuth2ClientConfiguration {
+
+    private String mClientId;
+
+    private String mClientSecret;
+
+    private String mRedirectUri;
+
+    public OAuth2ClientConfiguration(String clientId, String clientSecret, String redirectUri) {
+        mClientId = (clientId == null) ? "" : clientId;
+        mClientSecret = (clientSecret == null) ? "" : clientSecret;
+        mRedirectUri = (redirectUri == null) ? "" : redirectUri;
+    }
+
+    public String getClientId() {
+        return mClientId;
+    }
+
+    public String getClientSecret() {
+        return mClientSecret;
+    }
+
+    public String getRedirectUri() {
+        return mRedirectUri;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java
new file mode 100644
index 00000000..e390e357
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java
@@ -0,0 +1,68 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+/** 
+ * Constant values for OAuth 2 protocol.
+ * 
+ * Includes required and optional parameter NAMES used in the 'authorization code' grant type.
+ */
+
+public class OAuth2Constants {
+    
+    /// Parameters to send to the Authorization Endpoint
+    public static final String KEY_RESPONSE_TYPE = "response_type";
+    public static final String KEY_REDIRECT_URI = "redirect_uri";
+    public static final String KEY_CLIENT_ID = "client_id";
+    public static final String KEY_SCOPE = "scope";
+    public static final String KEY_STATE = "state"; 
+    
+    /// Additional parameters to send to the Token Endpoint
+    public static final String KEY_GRANT_TYPE = "grant_type";
+    public static final String KEY_CODE = "code";
+
+    // Used to get the Access Token using Refresh Token
+    public static final String OAUTH2_REFRESH_TOKEN_GRANT_TYPE = "refresh_token";
+    
+    /// Parameters received in an OK response from the Token Endpoint 
+    public static final String KEY_ACCESS_TOKEN = "access_token";
+    public static final String KEY_TOKEN_TYPE = "token_type";
+    public static final String KEY_EXPIRES_IN = "expires_in";
+    public static final String KEY_REFRESH_TOKEN = "refresh_token";
+    
+    /// Parameters in an ERROR response
+    public static final String KEY_ERROR = "error";
+    public static final String KEY_ERROR_DESCRIPTION = "error_description";
+    public static final String KEY_ERROR_URI = "error_uri";
+    public static final String VALUE_ERROR_ACCESS_DENIED = "access_denied";
+
+    /// Extra not standard
+    public static final String KEY_USER_ID = "user_id";
+
+    /// Depends on oauth2 grant type
+    public static final String OAUTH2_RESPONSE_TYPE_CODE = "code";
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java
new file mode 100644
index 00000000..4010da2f
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java
@@ -0,0 +1,46 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+public enum OAuth2GrantType {
+    AUTHORIZATION_CODE("authorization_code"),
+    IMPLICIT("implicit"),
+    PASSWORD("password"),
+    CLIENT_CREDENTIAL("client_credentials"),
+    REFRESH_TOKEN("refresh_token")  // not a grant type conceptually, but used as such to refresh access tokens
+    ;
+
+    private String mValue;
+
+    OAuth2GrantType(String value) {
+        mValue = value;
+    }
+
+    public String getValue() {
+        return mValue;
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java
new file mode 100644
index 00000000..f6f7c88a
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java
@@ -0,0 +1,66 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+public interface OAuth2Provider {
+
+    /**
+     * {@link OAuth2RequestBuilder} implementation for this provider.
+     *
+     * @return      {@link OAuth2RequestBuilder} implementation.
+     */
+    OAuth2RequestBuilder getOperationBuilder();
+
+
+    /**
+     * Set configuration of the client that will use this {@link OAuth2Provider}
+     * @param oAuth2ClientConfiguration     Configuration of the client that will use this {@link OAuth2Provider}
+     */
+    void setClientConfiguration(OAuth2ClientConfiguration oAuth2ClientConfiguration);
+
+    /**
+     * Configuration of the client that is using this {@link OAuth2Provider}
+     * return                   Configuration of the client that is usinng this {@link OAuth2Provider}
+     */
+    OAuth2ClientConfiguration getClientConfiguration();
+
+
+    /**
+     * Set base URI to authorization server.
+     *
+     * @param authorizationServerUri        Set base URL to authorization server.
+     */
+    void setAuthorizationServerUri(String authorizationServerUri);
+
+    /**
+     * base URI to authorization server.
+     *
+     * @return      Base URL to authorization server.
+     */
+    String getAuthorizationServerUri();
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java
new file mode 100644
index 00000000..11014cf1
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java
@@ -0,0 +1,122 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class OAuth2ProvidersRegistry {
+
+    private Map<String, OAuth2Provider> mProviders = new HashMap<>();
+
+    private OAuth2Provider mDefaultProvider = null;
+
+    private OAuth2ProvidersRegistry () {
+    }
+
+    /**
+     * See https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom
+     */
+    private static class LazyHolder {
+        private static final OAuth2ProvidersRegistry INSTANCE = new OAuth2ProvidersRegistry();
+    }
+
+    /**
+     * Singleton accesor.
+     *
+     * @return     Singleton isntance of {@link OAuth2ProvidersRegistry}
+     */
+    public static OAuth2ProvidersRegistry getInstance() {
+        return LazyHolder.INSTANCE;
+    }
+
+    /**
+     * Register an {@link OAuth2Provider} with the name passed as parameter.
+     *
+     * @param name              Name to bind 'oAuthProvider' in the registry.
+     * @param oAuth2Provider    An {@link OAuth2Provider} instance to keep in the registry.
+     * @throws IllegalArgumentException if 'name' or 'oAuthProvider' are null.
+     */
+    public void registerProvider(String name, OAuth2Provider oAuth2Provider) {
+        if (name == null) {
+            throw new IllegalArgumentException("Name must not be NULL");
+        }
+        if (oAuth2Provider == null) {
+            throw new IllegalArgumentException("oAuth2Provider must not be NULL");
+        }
+
+        mProviders.put(name, oAuth2Provider);
+        if (mProviders.size() == 1) {
+            mDefaultProvider = oAuth2Provider;
+        }
+    }
+
+    public OAuth2Provider unregisterProvider(String name) {
+        OAuth2Provider unregisteredProvider = mProviders.remove(name);
+        if (mProviders.size() == 0) {
+            mDefaultProvider = null;
+        } else if (unregisteredProvider != null && unregisteredProvider == mDefaultProvider) {
+            mDefaultProvider = mProviders.values().iterator().next();
+        }
+        return unregisteredProvider;
+    }
+
+    /**
+     * Get default {@link OAuth2Provider}.
+     *
+     * @return      Default provider, or NULL if there is no provider.
+     */
+    public OAuth2Provider getProvider() {
+        return mDefaultProvider;
+    }
+
+    /**
+     * Get {@link OAuth2Provider} registered with the name passed as parameter.
+     *
+     * @param name  Name used to register the desired {@link OAuth2Provider}
+     * @return      {@link OAuth2Provider} registered with the name 'name'
+     */
+    public OAuth2Provider getProvider(String name) {
+        return mProviders.get(name);
+    }
+
+    /**
+     * Sets the {@link OAuth2Provider} registered with the name passed as parameter as the default provider
+     *
+     * @param name  Name used to register the {@link OAuth2Provider} to set as default.
+     * @return      {@link OAuth2Provider} set as default, or NULL if no provider was registered with 'name'.
+     */
+    public OAuth2Provider setDefaultProvider(String name) {
+        OAuth2Provider toDefault = mProviders.get(name);
+        if (toDefault != null) {
+            mDefaultProvider = toDefault;
+        }
+        return toDefault;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java
new file mode 100644
index 00000000..e3fc6a31
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java
@@ -0,0 +1,75 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+import com.owncloud.android.lib.refactor.Log_OC;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class OAuth2QueryParser {
+
+    private static final String TAG = OAuth2QueryParser.class.getName();
+
+    private Map<String, String> mOAuth2ParsedAuthorizationResponse;
+
+    public OAuth2QueryParser() {
+        mOAuth2ParsedAuthorizationResponse = new HashMap<>();
+    }
+
+    public Map<String, String> parse(String query) {
+        mOAuth2ParsedAuthorizationResponse.clear();
+
+        if (query != null) {
+            String[] pairs = query.split("&");
+            int i = 0;
+            String key = "";
+            String value;
+            while (pairs.length > i) {
+                int j = 0;
+                String[] part = pairs[i].split("=");
+                while (part.length > j) {
+                    String p = part[j];
+                    if (j == 0) {
+                        key = p;
+                    } else if (j == 1) {
+                        value = p;
+                        mOAuth2ParsedAuthorizationResponse.put(key, value);
+                    }
+
+                    Log_OC.v(TAG, "[" + i + "," + j + "] = " + p);
+                    j++;
+                }
+                i++;
+            }
+        }
+
+        return mOAuth2ParsedAuthorizationResponse;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
new file mode 100644
index 00000000..018280f8
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
@@ -0,0 +1,48 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+import com.owncloud.android.lib.refactor.RemoteOperation;
+
+public interface OAuth2RequestBuilder {
+
+    enum OAuthRequest {
+        GET_AUTHORIZATION_CODE, CREATE_ACCESS_TOKEN, REFRESH_ACCESS_TOKEN
+    }
+
+    void setRequest(OAuthRequest operation);
+
+    void setGrantType(OAuth2GrantType grantType);
+
+    void setAuthorizationCode(String code);
+
+    void setRefreshToken(String refreshToken);
+
+    RemoteOperation buildOperation();
+
+    String buildUri();
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java
new file mode 100644
index 00000000..86fb2a24
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java
@@ -0,0 +1,77 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class OAuth2ResponseParser {
+
+    public Map<String, String> parseAccessTokenResult(JSONObject tokenJson) throws JSONException {
+        Map<String, String> resultTokenMap = new HashMap<>();
+
+        if (tokenJson.has(OAuth2Constants.KEY_ACCESS_TOKEN)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ACCESS_TOKEN, tokenJson.
+                getString(OAuth2Constants.KEY_ACCESS_TOKEN));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_TOKEN_TYPE)) {
+            resultTokenMap.put(OAuth2Constants.KEY_TOKEN_TYPE, tokenJson.
+                getString(OAuth2Constants.KEY_TOKEN_TYPE));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_EXPIRES_IN)) {
+            resultTokenMap.put(OAuth2Constants.KEY_EXPIRES_IN, tokenJson.
+                getString(OAuth2Constants.KEY_EXPIRES_IN));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_REFRESH_TOKEN)) {
+            resultTokenMap.put(OAuth2Constants.KEY_REFRESH_TOKEN, tokenJson.
+                getString(OAuth2Constants.KEY_REFRESH_TOKEN));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_SCOPE)) {
+            resultTokenMap.put(OAuth2Constants.KEY_SCOPE, tokenJson.
+                getString(OAuth2Constants.KEY_SCOPE));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ERROR, tokenJson.
+                getString(OAuth2Constants.KEY_ERROR));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR_DESCRIPTION)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ERROR_DESCRIPTION, tokenJson.
+                getString(OAuth2Constants.KEY_ERROR_DESCRIPTION));
+        }
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR_URI)) {
+            resultTokenMap.put(OAuth2Constants.KEY_ERROR_URI, tokenJson.
+                getString(OAuth2Constants.KEY_ERROR_URI));
+        }
+
+        if (tokenJson.has(OAuth2Constants.KEY_USER_ID)) {   // not standard
+            resultTokenMap.put(OAuth2Constants.KEY_USER_ID, tokenJson.
+                getString(OAuth2Constants.KEY_USER_ID));
+        }
+
+        return resultTokenMap;
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java
new file mode 100644
index 00000000..a7a41e94
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java
@@ -0,0 +1,94 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+import com.owncloud.android.lib.refactor.Log_OC;
+
+public class OwnCloudOAuth2Provider implements OAuth2Provider {
+
+    public static final String NAME = OAuth2Provider.class.getName();
+
+    public static final String ACCESS_TOKEN_ENDPOINT_PATH = "index.php/apps/oauth2/api/v1/token";
+    private static final String AUTHORIZATION_CODE_ENDPOINT_PATH = "index.php/apps/oauth2/authorize";
+
+    private String mAuthorizationServerUrl = "";
+    private String mAccessTokenEndpointPath = ACCESS_TOKEN_ENDPOINT_PATH;
+    private String mAuthorizationCodeEndpointPath = AUTHORIZATION_CODE_ENDPOINT_PATH;
+
+    private OAuth2ClientConfiguration mClientConfiguration;
+
+    @Override
+    public OAuth2RequestBuilder getOperationBuilder() {
+        return new OwnCloudOAuth2RequestBuilder(this);
+    }
+
+    @Override
+    public void setClientConfiguration(OAuth2ClientConfiguration oAuth2ClientConfiguration) {
+        mClientConfiguration = oAuth2ClientConfiguration;
+    }
+
+    @Override
+    public OAuth2ClientConfiguration getClientConfiguration() {
+        return mClientConfiguration;
+    }
+
+    @Override
+    public void setAuthorizationServerUri(String authorizationServerUri) {
+        mAuthorizationServerUrl = authorizationServerUri;
+    }
+
+    @Override
+    public String getAuthorizationServerUri() {
+        return mAuthorizationServerUrl;
+    }
+
+    public String getAccessTokenEndpointPath() {
+        return mAccessTokenEndpointPath;
+    }
+
+    public void setAccessTokenEndpointPath(String accessTokenEndpointPath) {
+        if (accessTokenEndpointPath == null || accessTokenEndpointPath.length() <= 0) {
+            Log_OC.w(NAME, "Setting invalid access token endpoint path, going on with default");
+            mAccessTokenEndpointPath = ACCESS_TOKEN_ENDPOINT_PATH;
+        } else {
+            mAccessTokenEndpointPath = accessTokenEndpointPath;
+        }
+    }
+
+    public String getAuthorizationCodeEndpointPath() {
+        return mAuthorizationCodeEndpointPath;
+    }
+
+    public void setAuthorizationCodeEndpointPath(String authorizationCodeEndpointPath) {
+        if (authorizationCodeEndpointPath == null || authorizationCodeEndpointPath.length() <= 0) {
+            Log_OC.w(NAME, "Setting invalid authorization code endpoint path, going on with default");
+            mAuthorizationCodeEndpointPath = AUTHORIZATION_CODE_ENDPOINT_PATH;
+        } else {
+            mAuthorizationCodeEndpointPath = authorizationCodeEndpointPath;
+        }
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
new file mode 100644
index 00000000..34241c42
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
@@ -0,0 +1,153 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2GetAccessTokenOperation;
+import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2RefreshAccessTokenOperation;
+
+public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
+
+    private OwnCloudContext ocContext;
+    private OwnCloudOAuth2Provider mOAuth2Provider;
+
+    private OAuthRequest mRequest;
+    private OAuth2GrantType mGrantType = OAuth2GrantType.AUTHORIZATION_CODE;
+    private String mCode;
+    private String mRefreshToken;
+
+    public OwnCloudOAuth2RequestBuilder(OwnCloudOAuth2Provider ownCloudOAuth2Provider) {
+        mOAuth2Provider = ownCloudOAuth2Provider;
+    }
+
+    @Override
+    public void setRequest(OAuthRequest request) {
+        mRequest = request;
+    }
+
+    @Override
+    public void setGrantType(OAuth2GrantType grantType) {
+        mGrantType = grantType;
+    }
+
+    @Override
+    public void setAuthorizationCode(String code) {
+        mCode = code;
+    }
+
+    @Override
+    public void setRefreshToken(String refreshToken) {
+        mRefreshToken = refreshToken;
+    }
+
+    public void setOcContext(OwnCloudContext ocContext) {
+        this.ocContext = ocContext;
+    }
+
+    @Override
+    public RemoteOperation buildOperation() {
+        if (mGrantType != OAuth2GrantType.AUTHORIZATION_CODE &&
+                mGrantType != OAuth2GrantType.REFRESH_TOKEN) {
+            throw new UnsupportedOperationException(
+                    "Unsupported grant type. Only " +
+                            OAuth2GrantType.AUTHORIZATION_CODE.getValue() + " and " +
+                            OAuth2GrantType.REFRESH_TOKEN + " are supported");
+        }
+        OAuth2ClientConfiguration clientConfiguration = mOAuth2Provider.getClientConfiguration();
+
+        switch(mRequest) {
+            case CREATE_ACCESS_TOKEN:
+                return new OAuth2GetAccessTokenOperation(
+                        ocContext,
+                        mGrantType.getValue(),
+                        mCode,
+                        clientConfiguration.getClientId(),
+                        clientConfiguration.getClientSecret(),
+                        clientConfiguration.getRedirectUri(),
+                        mOAuth2Provider.getAccessTokenEndpointPath());
+
+            case REFRESH_ACCESS_TOKEN:
+                return new OAuth2RefreshAccessTokenOperation(
+                        ocContext,
+                        clientConfiguration.getClientId(),
+                        clientConfiguration.getClientSecret(),
+                        mRefreshToken,
+                        mOAuth2Provider.getAccessTokenEndpointPath());
+            default:
+                throw new UnsupportedOperationException("Unsupported request");
+        }
+    }
+
+    @Override
+    public String buildUri() {
+        if (OAuth2GrantType.AUTHORIZATION_CODE != mGrantType) {
+            throw new UnsupportedOperationException(
+                    "Unsupported grant type. Only " +
+                            OAuth2GrantType.AUTHORIZATION_CODE.getValue() + " is supported by this provider"
+            );
+        }
+        OAuth2ClientConfiguration clientConfiguration = mOAuth2Provider.getClientConfiguration();
+        Uri uri;
+        Uri.Builder uriBuilder;
+        switch(mRequest) {
+            case GET_AUTHORIZATION_CODE:
+                uri = Uri.parse(mOAuth2Provider.getAuthorizationServerUri());
+                uriBuilder = uri.buildUpon();
+                uriBuilder.appendEncodedPath(mOAuth2Provider.getAuthorizationCodeEndpointPath());
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_RESPONSE_TYPE, OAuth2Constants.OAUTH2_RESPONSE_TYPE_CODE);
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_REDIRECT_URI, clientConfiguration.getRedirectUri());
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_CLIENT_ID, clientConfiguration.getClientId());
+
+                uri = uriBuilder.build();
+                return uri.toString();
+
+            case CREATE_ACCESS_TOKEN:
+                uri = Uri.parse(mOAuth2Provider.getAuthorizationServerUri());
+                uriBuilder = uri.buildUpon();
+                uriBuilder.appendEncodedPath(mOAuth2Provider.getAccessTokenEndpointPath());
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_RESPONSE_TYPE, OAuth2Constants.OAUTH2_RESPONSE_TYPE_CODE);
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_REDIRECT_URI, clientConfiguration.getRedirectUri());
+                uriBuilder.appendQueryParameter(
+                        OAuth2Constants.KEY_CLIENT_ID, clientConfiguration.getClientId());
+
+                uri = uriBuilder.build();
+                return uri.toString();
+
+            default:
+                throw new UnsupportedOperationException("Unsupported request");
+        }
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
new file mode 100644
index 00000000..d2b66226
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -0,0 +1,136 @@
+/* ownCloud Android Library is available under MIT license
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth.operations;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
+import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
+import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Provider;
+import com.owncloud.android.lib.refactor.RemoteOperation;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import okhttp3.MultipartBody;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+
+public class OAuth2GetAccessTokenOperation extends RemoteOperation {
+    
+    private final String mGrantType;
+    private final String mCode;
+    private final String mClientId;
+    private final String mClientSecret;
+    private final String mRedirectUri;
+    private final String mAccessTokenEndpointPath;
+
+    private final OAuth2ResponseParser mResponseParser;
+
+
+    public OAuth2GetAccessTokenOperation(
+            OwnCloudContext context,
+            String grantType,
+            String code,
+            String clientId,
+            String secretId,
+            String redirectUri,
+            String accessTokenEndpointPath) {
+        super(context);
+        mClientId = clientId;
+        mClientSecret = secretId;
+        mRedirectUri = redirectUri;
+        mGrantType = grantType;
+        mCode = code;
+
+        mAccessTokenEndpointPath =
+            accessTokenEndpointPath != null
+                    ? accessTokenEndpointPath
+                    : OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH;
+
+        mResponseParser = new OAuth2ResponseParser();
+    }
+
+    @Override
+    public RemoteOperationResult exec() {
+        try {
+
+            final Uri uri = getOCContext()
+                    .getBaseUri()
+                    .buildUpon()
+                    .appendEncodedPath(mAccessTokenEndpointPath)
+                    .build();
+
+            final RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE, mGrantType)
+                    .addFormDataPart(OAuth2Constants.KEY_CODE, mCode)
+                    .addFormDataPart(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri)
+                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
+                    .build();
+
+            final Request request = getRequestBuilder()
+                    .url(uri.toString())
+                    .method("POST", requestBody)
+                    .build();
+
+            final Response response = getClient()
+                    .newCall(request)
+                    .execute();
+
+            final String responseData = response.body().string();
+            if (responseData != null && responseData.length() > 0) {
+                JSONObject tokenJson = new JSONObject(responseData);
+                Map<String, String> accessTokenResult =
+                    mResponseParser.parseAccessTokenResult(tokenJson);
+                if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
+                    return new RemoteOperationResult(RemoteOperationResult.ResultCode.OAUTH2_ERROR);
+
+                } else {
+                    final RemoteOperationResult result = new RemoteOperationResult(true, request, response);
+                    ArrayList<Object> data = new ArrayList<>();
+                    data.add(accessTokenResult);
+                    result.setData(data);
+                    return result;
+                }
+
+            } else {
+                return new RemoteOperationResult(false, request, response);
+            }
+
+        } catch (Exception e) {
+            return new RemoteOperationResult(e);
+        }
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
new file mode 100644
index 00000000..f9e4595f
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -0,0 +1,134 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David González Verdugo
+ *
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.oauth.operations;
+
+import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.Log_OC;
+import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudBasicCredentials;
+import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
+import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
+import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
+import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Provider;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import okhttp3.MultipartBody;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
+
+    private static final String TAG = OAuth2RefreshAccessTokenOperation.class.getSimpleName();
+
+    private String mClientId;
+    private String mClientSecret;
+    private String mRefreshToken;
+
+    private final String mAccessTokenEndpointPath;
+
+    private final OAuth2ResponseParser mResponseParser;
+
+    public OAuth2RefreshAccessTokenOperation(
+            OwnCloudContext ocContext,
+            String clientId,
+            String secretId,
+            String refreshToken,
+            String accessTokenEndpointPath
+    ) {
+        super(ocContext);
+
+        mClientId = clientId;
+        mClientSecret = secretId;
+        mRefreshToken = refreshToken;
+
+        mAccessTokenEndpointPath =
+                accessTokenEndpointPath != null ?
+                        accessTokenEndpointPath :
+                        OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH
+        ;
+
+        mResponseParser = new OAuth2ResponseParser();
+    }
+
+    @Override
+    public RemoteOperationResult exec() {
+        try {
+
+
+            final RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE,
+                            OAuth2GrantType.REFRESH_TOKEN.getValue())
+                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
+                    .addFormDataPart(OAuth2Constants.KEY_REFRESH_TOKEN, mRefreshToken)
+                    .build();
+
+            final Request request = getRequestBuilder()
+                    .url(getOCContext().getBaseUri().buildUpon()
+                            .appendEncodedPath(mAccessTokenEndpointPath)
+                            .build()
+                            .toString())
+                    .method("POST", requestBody)
+                    .build();
+
+
+            OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(
+                    mClientId,
+                    mClientSecret
+            );
+
+            final Response response = getClient().newCall(request).execute();
+            final String responseData = response.body().string();
+            Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + responseData);
+
+            if (responseData != null && responseData.length() > 0) {
+                JSONObject tokenJson = new JSONObject(responseData);
+                Map<String, String> accessTokenResult =
+                    mResponseParser.parseAccessTokenResult(tokenJson);
+                if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
+                    return new RemoteOperationResult(RemoteOperationResult.ResultCode.OAUTH2_ERROR);
+
+                } else {
+                    final RemoteOperationResult result = new RemoteOperationResult(true, request, response);
+                    ArrayList<Object> data = new ArrayList<>();
+                    data.add(accessTokenResult);
+                    result.setData(data);
+                    return result;
+                }
+
+            } else {
+                return new RemoteOperationResult(false, request, response);
+            }
+
+        } catch (Exception e) {
+            return new RemoteOperationResult(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java b/src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java
new file mode 100644
index 00000000..7582bb0f
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java
@@ -0,0 +1,140 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.exceptions;
+
+import com.owncloud.android.lib.common.network.AdvancedSslSocketFactory;
+import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
+
+import java.security.cert.CertPathValidatorException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLPeerUnverifiedException;
+
+/**
+ * Exception joining all the problems that {@link AdvancedX509TrustManager} can find in
+ * a certificate chain for a server.
+ * 
+ * This was initially created as an extension of CertificateException, but some
+ * implementations of the SSL socket layer in existing devices are REPLACING the CertificateException
+ * instances thrown by {@link javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[], String)}
+ * with SSLPeerUnverifiedException FORGETTING THE CAUSING EXCEPTION instead of wrapping it. 
+ * 
+ * Due to this, extending RuntimeException is necessary to get that the CertificateCombinedException 
+ * instance reaches {@link AdvancedSslSocketFactory#verifyPeerIdentity}.
+ * 
+ * BE CAREFUL. As a RuntimeException extensions, Java compilers do not require to handle it
+ * in client methods. Be sure to use it only when you know exactly where it will go.
+ * 
+ * @author David A. Velasco
+ */
+public class CertificateCombinedException extends RuntimeException {
+
+    /** Generated - to refresh every time the class changes */
+    private static final long serialVersionUID = -8875782030758554999L;
+    
+    private X509Certificate mServerCert = null;
+    private String mHostInUrl;
+
+    private CertificateExpiredException mCertificateExpiredException = null;
+    private CertificateNotYetValidException mCertificateNotYetValidException = null;
+    private CertPathValidatorException mCertPathValidatorException = null;
+    private CertificateException mOtherCertificateException = null;
+    private SSLPeerUnverifiedException mSslPeerUnverifiedException = null;
+    
+    public CertificateCombinedException(X509Certificate x509Certificate) {
+        mServerCert = x509Certificate;
+    }
+
+    public X509Certificate getServerCertificate() {
+        return mServerCert;
+    }
+
+    public String getHostInUrl() {
+        return mHostInUrl;
+    }
+
+    public void setHostInUrl(String host) {
+        mHostInUrl = host;
+    }
+
+    public CertificateExpiredException getCertificateExpiredException() {
+        return mCertificateExpiredException;
+    }
+
+    public void setCertificateExpiredException(CertificateExpiredException c) {
+        mCertificateExpiredException  = c;
+    }
+
+    public CertificateNotYetValidException getCertificateNotYetValidException() {
+        return mCertificateNotYetValidException;
+    }
+
+    public void setCertificateNotYetException(CertificateNotYetValidException c) {
+        mCertificateNotYetValidException = c;
+    }
+
+    public CertPathValidatorException getCertPathValidatorException() {
+        return mCertPathValidatorException;
+    }
+
+    public void setCertPathValidatorException(CertPathValidatorException c) {
+        mCertPathValidatorException = c;
+    }
+
+    public CertificateException getOtherCertificateException() {
+        return mOtherCertificateException;
+    }
+
+    public void setOtherCertificateException(CertificateException c) {
+        mOtherCertificateException = c;
+    }
+
+    public SSLPeerUnverifiedException getSslPeerUnverifiedException() {
+        return mSslPeerUnverifiedException ; 
+    }
+
+    public void setSslPeerUnverifiedException(SSLPeerUnverifiedException s) {
+        mSslPeerUnverifiedException = s;
+    }
+
+    public boolean isException() {
+        return (mCertificateExpiredException != null ||
+                mCertificateNotYetValidException != null ||
+                mCertPathValidatorException != null ||
+                mOtherCertificateException != null ||
+                mSslPeerUnverifiedException != null);
+    }
+
+    public boolean isRecoverable() {
+        return (mCertificateExpiredException != null ||
+                mCertificateNotYetValidException != null ||
+                mCertPathValidatorException != null ||
+                mSslPeerUnverifiedException != null);
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java b/src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java
new file mode 100644
index 00000000..27a5ede6
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java
@@ -0,0 +1,34 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.exceptions;
+
+public class OperationCancelledException extends Exception {
+
+    /**
+     * Generated serial version - to avoid Java warning
+     */
+    private static final long serialVersionUID = -6350981497740424983L;
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
new file mode 100644
index 00000000..c9395a88
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -0,0 +1,18 @@
+package com.owncloud.android.lib.refactor.operations;
+
+import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.RemoteOperationResult;
+
+public class PropfindOperation extends RemoteOperation {
+
+    public PropfindOperation(OwnCloudContext context) {
+        super(context);
+    }
+
+    @Override
+    public RemoteOperationResult exec() {
+
+        return null;
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java b/src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java
new file mode 100644
index 00000000..92ab5662
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java
@@ -0,0 +1,49 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.utils;
+
+/**
+ * @author masensio
+ * @author David A. Velasco
+ */
+public class AccountTypeUtils {
+
+    public static String getAuthTokenTypePass(String accountType) {
+        return accountType + ".password";
+    }
+    
+    public static String getAuthTokenTypeAccessToken(String accountType) {
+        return accountType  + ".oauth2.access_token";
+    }
+    
+    public static String getAuthTokenTypeRefreshToken(String accountType) {
+        return accountType  + ".oauth2.refresh_token";
+    }
+    
+    public static String getAuthTokenTypeSamlSessionCookie(String accountType) {
+        return accountType  +  ".saml.web_sso.session_cookie";
+    }
+    
+}
diff --git a/src/com/owncloud/android/lib/refactor/utils/AccountUtils.java b/src/com/owncloud/android/lib/refactor/utils/AccountUtils.java
new file mode 100644
index 00000000..e5d54fe1
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/utils/AccountUtils.java
@@ -0,0 +1,321 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *   Copyright (C) 2012  Bartek Przybylski
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.utils;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountsException;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.Context;
+import android.net.Uri;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+
+import org.apache.commons.httpclient.Cookie;
+
+import java.io.IOException;
+
+public class AccountUtils {
+
+    private static final String TAG = AccountUtils.class.getSimpleName();
+
+    /**
+     * Constructs full url to host and webdav resource basing on host version
+     *
+     * @param context               Valid Android {@link Context}, needed to access the {@link AccountManager}
+     * @param account               A stored ownCloud {@link Account}
+     * @return                      Full URL to WebDAV endpoint in the server corresponding to 'account'.
+     * @throws AccountNotFoundException When 'account' is unknown for the AccountManager
+     */
+    public static String getWebDavUrlForAccount(Context context, Account account)
+        throws AccountNotFoundException {
+
+        return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_PATH_4_0;
+    }
+
+
+    /**
+     * Extracts url server from the account
+     *
+     * @param context               Valid Android {@link Context}, needed to access the {@link AccountManager}
+     * @param account               A stored ownCloud {@link Account}
+     * @return                      Full URL to the server corresponding to 'account', ending in the base path
+     *                              common to all API endpoints.
+     * @throws AccountNotFoundException When 'account' is unknown for the AccountManager
+     */
+    public static String getBaseUrlForAccount(Context context, Account account)
+        throws AccountNotFoundException {
+        AccountManager ama = AccountManager.get(context.getApplicationContext());
+        String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL);
+
+        if (baseurl == null)
+            throw new AccountNotFoundException(account, "Account not found", null);
+
+        return baseurl;
+    }
+
+
+    /**
+     * Get the username corresponding to an OC account.
+     *
+     * @param account An OC account
+     * @return Username for the given account, extracted from the account.name
+     */
+    public static String getUsernameForAccount(Account account) {
+        String username = null;
+        try {
+            username = account.name.substring(0, account.name.lastIndexOf('@'));
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Couldn't get a username for the given account", e);
+        }
+        return username;
+    }
+
+    /**
+     * Get the stored server version corresponding to an OC account.
+     *
+     * @param account   An OC account
+     * @param context   Application context
+     * @return Version of the OC server, according to last check
+     */
+    public static OwnCloudVersion getServerVersionForAccount(Account account, Context context) {
+        AccountManager ama = AccountManager.get(context);
+        OwnCloudVersion version = null;
+        try {
+            String versionString = ama.getUserData(account, Constants.KEY_OC_VERSION);
+            version = new OwnCloudVersion(versionString);
+
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Couldn't get a the server version for an account", e);
+        }
+        return version;
+    }
+
+    /**
+     * @return
+     * @throws IOException
+     * @throws AuthenticatorException
+     * @throws OperationCanceledException
+     */
+    public static OwnCloudCredentials getCredentialsForAccount(Context context, Account account)
+        throws OperationCanceledException, AuthenticatorException, IOException {
+
+        OwnCloudCredentials credentials = null;
+        AccountManager am = AccountManager.get(context);
+
+        String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
+        boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE");
+
+        String supportsSamlSSo = am.getUserData(account,
+                AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO);
+
+        boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE");
+
+        String username = AccountUtils.getUsernameForAccount(account);
+        OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION));
+
+        if (isOauth2) {
+            String accessToken = am.blockingGetAuthToken(
+                account,
+                AccountTypeUtils.getAuthTokenTypeAccessToken(account.type),
+                false);
+
+            credentials = OwnCloudCredentialsFactory.newBearerCredentials(username, accessToken);
+
+        } else if (isSamlSso) {
+            String accessToken = am.blockingGetAuthToken(
+                account,
+                AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(account.type),
+                false);
+
+            credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(username, accessToken);
+
+        } else {
+            String password = am.blockingGetAuthToken(
+                account,
+                AccountTypeUtils.getAuthTokenTypePass(account.type),
+                false);
+
+            credentials = OwnCloudCredentialsFactory.newBasicCredentials(
+                username,
+                password,
+                version.isPreemptiveAuthenticationPreferred()
+            );
+        }
+
+        return credentials;
+
+    }
+
+
+    public static String buildAccountNameOld(Uri serverBaseUrl, String username) {
+        if (serverBaseUrl.getScheme() == null) {
+            serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
+        }
+        String accountName = username + "@" + serverBaseUrl.getHost();
+        if (serverBaseUrl.getPort() >= 0) {
+            accountName += ":" + serverBaseUrl.getPort();
+        }
+        return accountName;
+    }
+
+    public static String buildAccountName(Uri serverBaseUrl, String username) {
+        if (serverBaseUrl.getScheme() == null) {
+            serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
+        }
+
+        // Remove http:// or https://
+        String url = serverBaseUrl.toString();
+        if (url.contains("://")) {
+            url = url.substring(serverBaseUrl.toString().indexOf("://") + 3);
+        }
+        String accountName = username + "@" + url;
+
+        return accountName;
+    }
+
+    public static void saveClient(OwnCloudClient client, Account savedAccount, Context context) {
+
+        // Account Manager
+        AccountManager ac = AccountManager.get(context.getApplicationContext());
+
+        if (client != null) {
+            String cookiesString = client.getCookiesString();
+            if (!"".equals(cookiesString)) {
+                ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString);
+                // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
+            }
+        }
+
+    }
+
+
+    /**
+     * Restore the client cookies persisted in an account stored in the system AccountManager.
+     *
+     * @param account           Stored account.
+     * @param client            Client to restore cookies in.
+     * @param context           Android context used to access the system AccountManager.
+     */
+    public static void restoreCookies(Account account, OwnCloudClient client, Context context) {
+        if (account == null) {
+            Log_OC.d(TAG, "Cannot restore cookie for null account");
+
+        } else {
+            Log_OC.d(TAG, "Restoring cookies for " + account.name);
+
+            // Account Manager
+            AccountManager am = AccountManager.get(context.getApplicationContext());
+
+            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getWebdavUri();
+
+            String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
+            if (cookiesString != null) {
+                String[] cookies = cookiesString.split(";");
+                if (cookies.length > 0) {
+                    for (int i = 0; i < cookies.length; i++) {
+                        Cookie cookie = new Cookie();
+                        int equalPos = cookies[i].indexOf('=');
+                        cookie.setName(cookies[i].substring(0, equalPos));
+                        cookie.setValue(cookies[i].substring(equalPos + 1));
+                        cookie.setDomain(serverUri.getHost());    // VERY IMPORTANT
+                        cookie.setPath(serverUri.getPath());    // VERY IMPORTANT
+
+                        client.getState().addCookie(cookie);
+                    }
+                }
+            }
+        }
+    }
+
+    public static class AccountNotFoundException extends AccountsException {
+
+        /**
+         * Generated - should be refreshed every time the class changes!!
+         */
+        private static final long serialVersionUID = -1684392454798508693L;
+
+        private Account mFailedAccount;
+
+        public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {
+            super(message, cause);
+            mFailedAccount = failedAccount;
+        }
+
+        public Account getFailedAccount() {
+            return mFailedAccount;
+        }
+    }
+
+
+    public static class Constants {
+        /**
+         * Version should be 3 numbers separated by dot so it can be parsed by
+         * {@link OwnCloudVersion}
+         */
+        public static final String KEY_OC_VERSION = "oc_version";
+        /**
+         * Base url should point to owncloud installation without trailing / ie:
+         * http://server/path or https://owncloud.server
+         */
+        public static final String KEY_OC_BASE_URL = "oc_base_url";
+        /**
+         * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.
+         */
+        public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2";
+        /**
+         * Flag signaling if the ownCloud server can be accessed with session cookies from SAML-based web single-sign-on.
+         */
+        public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso";
+        /**
+         * OC account cookies
+         */
+        public static final String KEY_COOKIES = "oc_account_cookies";
+
+        /**
+         * OC account version
+         */
+        public static final String KEY_OC_ACCOUNT_VERSION = "oc_account_version";
+
+        /**
+         * User's display name
+         */
+        public static final String KEY_DISPLAY_NAME = "oc_display_name";
+
+        /**
+         * OAuth2 refresh token
+         **/
+        public static final String KEY_OAUTH2_REFRESH_TOKEN = "oc_oauth2_refresh_token";
+
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java b/src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java
new file mode 100644
index 00000000..e886bd62
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java
@@ -0,0 +1,138 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2017 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+package com.owncloud.android.lib.refactor.utils;
+
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Parser for server exceptions
+ * @author davidgonzalez
+ */
+public class ErrorMessageParser {
+	// No namespaces
+	private static final String ns = null;
+
+	// Nodes for XML Parser
+	private static final String NODE_ERROR = "d:error";
+	private static final String NODE_MESSAGE = "s:message";
+
+	/**
+	 * Parse exception response
+	 * @param is
+	 * @return errorMessage for an exception
+	 * @throws XmlPullParserException
+	 * @throws IOException
+	 */
+	public String parseXMLResponse(InputStream is) throws XmlPullParserException,
+			IOException {
+		String errorMessage = "";
+
+		try {
+			// XMLPullParser
+			XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+			factory.setNamespaceAware(true);
+
+			XmlPullParser parser = Xml.newPullParser();
+			parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+			parser.setInput(is, null);
+			parser.nextTag();
+			errorMessage = readError(parser);
+
+		} finally {
+			is.close();
+		}
+		return errorMessage;
+	}
+
+	/**
+	 * Parse OCS node
+	 * @param parser
+	 * @return reason for exception
+	 * @throws XmlPullParserException
+	 * @throws IOException
+	 */
+	private String readError (XmlPullParser parser) throws XmlPullParserException, IOException {
+		String errorMessage = "";
+		parser.require(XmlPullParser.START_TAG,  ns , NODE_ERROR);
+		while (parser.next() != XmlPullParser.END_TAG) {
+			if (parser.getEventType() != XmlPullParser.START_TAG) {
+				continue;
+			}
+			String name = parser.getName();
+			// read NODE_MESSAGE
+			if (name.equalsIgnoreCase(NODE_MESSAGE)) {
+				errorMessage = readText(parser);
+			} else {
+				skip(parser);
+			}
+		}
+		return errorMessage;
+	}
+
+	/**
+	 * Skip tags in parser procedure
+	 * @param parser
+	 * @throws XmlPullParserException
+	 * @throws IOException
+	 */
+	private void skip(XmlPullParser parser) throws XmlPullParserException, IOException {
+		if (parser.getEventType() != XmlPullParser.START_TAG) {
+			throw new IllegalStateException();
+		}
+		int depth = 1;
+		while (depth != 0) {
+			switch (parser.next()) {
+				case XmlPullParser.END_TAG:
+					depth--;
+					break;
+				case XmlPullParser.START_TAG:
+					depth++;
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Read the text from a node
+	 * @param parser
+	 * @return Text of the node
+	 * @throws IOException
+	 * @throws XmlPullParserException
+	 */
+	private String readText(XmlPullParser parser) throws IOException, XmlPullParserException {
+		String result = "";
+		if (parser.next() == XmlPullParser.TEXT) {
+			result = parser.getText();
+			parser.nextTag();
+		}
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java b/src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java
new file mode 100644
index 00000000..a5733961
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java
@@ -0,0 +1,144 @@
+
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+package com.owncloud.android.lib.refactor.utils;
+
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Parser for Invalid Character server exception
+ * @author masensio
+ */
+public class InvalidCharacterExceptionParser {
+
+    private static final String EXCEPTION_STRING = "OC\\Connector\\Sabre\\Exception\\InvalidPath";
+	private static final String EXCEPTION_UPLOAD_STRING = "OCP\\Files\\InvalidPathException";
+
+    // No namespaces
+	private static final String ns = null;
+
+    // Nodes for XML Parser
+    private static final String NODE_ERROR = "d:error";
+	private static final String NODE_EXCEPTION = "s:exception";
+    /**
+	 * Parse is as an Invalid Path Exception
+	 * @param is
+	 * @return if The exception is an Invalid Char Exception
+	 * @throws XmlPullParserException
+	 * @throws IOException
+	 */
+	public boolean parseXMLResponse(InputStream is) throws XmlPullParserException,
+            IOException {
+        boolean result = false;
+
+		try {
+			// XMLPullParser
+			XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+			factory.setNamespaceAware(true);
+
+			XmlPullParser parser = Xml.newPullParser();
+			parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+			parser.setInput(is, null);
+			parser.nextTag();
+			result = readError(parser);
+
+		} finally {
+			is.close();
+		}
+		return result;
+	}
+
+	/**
+	 * Parse OCS node
+	 * @param parser
+	 * @return List of ShareRemoteFiles
+	 * @throws XmlPullParserException
+	 * @throws IOException
+	 */
+	private boolean readError (XmlPullParser parser) throws XmlPullParserException, IOException {
+		String exception = "";
+		parser.require(XmlPullParser.START_TAG,  ns , NODE_ERROR);
+		while (parser.next() != XmlPullParser.END_TAG) {
+			if (parser.getEventType() != XmlPullParser.START_TAG) {
+				continue;
+			}
+			String name = parser.getName();
+			// read NODE_EXCEPTION
+			if (name.equalsIgnoreCase(NODE_EXCEPTION)) {
+				exception = readText(parser);
+			} else {
+				skip(parser);
+			}
+
+		}
+		return exception.equalsIgnoreCase(EXCEPTION_STRING) ||
+				exception.equalsIgnoreCase(EXCEPTION_UPLOAD_STRING);
+	}
+
+	/**
+	 * Skip tags in parser procedure
+	 * @param parser
+	 * @throws XmlPullParserException
+	 * @throws IOException
+	 */
+	private void skip(XmlPullParser parser) throws XmlPullParserException, IOException {
+		if (parser.getEventType() != XmlPullParser.START_TAG) {
+			throw new IllegalStateException();
+		}
+		int depth = 1;
+		while (depth != 0) {
+			switch (parser.next()) {
+			case XmlPullParser.END_TAG:
+				depth--;
+				break;
+			case XmlPullParser.START_TAG:
+				depth++;
+				break;
+			}
+		}
+	}
+
+    	/**
+	 * Read the text from a node
+	 * @param parser
+	 * @return Text of the node
+	 * @throws IOException
+	 * @throws XmlPullParserException
+	 */
+	private String readText(XmlPullParser parser) throws IOException, XmlPullParserException {
+		String result = "";
+		if (parser.next() == XmlPullParser.TEXT) {
+			result = parser.getText();
+			parser.nextTag();
+		}
+		return result;
+	}
+}
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index d6caae8e..cd3616b1 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -38,6 +38,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import at.bitfire.dav4android.DavResource;
+
 /**
  * Remote operation performing the read of remote file or folder in the ownCloud server.
  *
@@ -72,6 +74,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
         PropFindMethod query = null;
 
         try {
+
             // remote request
             query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
                 WebdavUtils.getAllPropSet(),    // PropFind Properties
diff --git a/test_client/build.gradle b/test_client/build.gradle
index 8d01b841..f78ec71a 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -43,4 +43,8 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }

From e354a716cb65a7afef95b304f584cdc996177175 Mon Sep 17 00:00:00 2001
From: DerSchabi <chris.schabesberger@mailbox.org>
Date: Thu, 17 May 2018 09:53:25 +0200
Subject: [PATCH 002/133] ren owncloud to OC

---
 .../{OwnCloudContext.java => OCContext.java}     | 16 ++++++++--------
 .../android/lib/refactor/RemoteOperation.java    |  8 +++-----
 ...nCloudCredentials.java => OCCredentials.java} |  2 +-
 ...dentials.java => OCAnonymousCredentials.java} |  4 ++--
 ...cCredentials.java => OCBasicCredentials.java} |  7 +++----
 ...Credentials.java => OCBearerCredentials.java} |  8 +++-----
 ...redentials.java => OCSamlSsoCredentials.java} |  8 +++-----
 .../oauth/OwnCloudOAuth2RequestBuilder.java      |  6 +++---
 .../OAuth2GetAccessTokenOperation.java           |  4 ++--
 .../OAuth2RefreshAccessTokenOperation.java       | 10 +++++-----
 .../refactor/operations/PropfindOperation.java   |  4 ++--
 11 files changed, 35 insertions(+), 42 deletions(-)
 rename src/com/owncloud/android/lib/refactor/{OwnCloudContext.java => OCContext.java} (70%)
 rename src/com/owncloud/android/lib/refactor/authentication/{OwnCloudCredentials.java => OCCredentials.java} (97%)
 rename src/com/owncloud/android/lib/refactor/authentication/credentials/{OwnCloudAnonymousCredentials.java => OCAnonymousCredentials.java} (75%)
 rename src/com/owncloud/android/lib/refactor/authentication/credentials/{OwnCloudBasicCredentials.java => OCBasicCredentials.java} (89%)
 rename src/com/owncloud/android/lib/refactor/authentication/credentials/{OwnCloudBearerCredentials.java => OCBearerCredentials.java} (89%)
 rename src/com/owncloud/android/lib/refactor/authentication/credentials/{OwnCloudSamlSsoCredentials.java => OCSamlSsoCredentials.java} (90%)

diff --git a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
similarity index 70%
rename from src/com/owncloud/android/lib/refactor/OwnCloudContext.java
rename to src/com/owncloud/android/lib/refactor/OCContext.java
index 7259b861..9602f588 100644
--- a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
+++ b/src/com/owncloud/android/lib/refactor/OCContext.java
@@ -2,11 +2,11 @@ package com.owncloud.android.lib.refactor;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 
-public class OwnCloudContext {
-    private static final String TAG = OwnCloudContext.class.toString();
+public class OCContext {
+    private static final String TAG = OCContext.class.toString();
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
     public static final String STATUS_PATH = "/status.php";
@@ -18,13 +18,13 @@ public class OwnCloudContext {
     private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
 
-    private OwnCloudCredentials mCredentials = null;
+    private OCCredentials mCredentials = null;
     private Uri mBaseUri;
 
     public class Builder {
-        OwnCloudContext ocContext = new OwnCloudContext();
+        OCContext ocContext = new OCContext();
 
-        public Builder setCredentials(OwnCloudCredentials credentials) {
+        public Builder setCredentials(OCCredentials credentials) {
             ocContext.mCredentials = credentials;
             return this;
         }
@@ -34,13 +34,13 @@ public class OwnCloudContext {
             return this;
         }
 
-        public OwnCloudContext build() {
+        public OCContext build() {
             return ocContext;
         }
     }
 
 
-    public OwnCloudCredentials getCredentials() {
+    public OCCredentials getCredentials() {
         return mCredentials;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 3fdbac5c..50c23a06 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,17 +1,15 @@
 package com.owncloud.android.lib.refactor;
 
-import com.owncloud.android.lib.refactor.RemoteOperation;
-
 import java.util.Map;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
 public abstract class RemoteOperation {
-    private final OwnCloudContext mContext;
+    private final OCContext mContext;
     private static OkHttpClient httpClient = null;
 
-    protected RemoteOperation(OwnCloudContext context) {
+    protected RemoteOperation(OCContext context) {
         mContext = context;
 
         if(httpClient == null) {
@@ -23,7 +21,7 @@ public abstract class RemoteOperation {
 
     public abstract RemoteOperationResult exec();
 
-    public OwnCloudContext getOCContext() {
+    public OCContext getOCContext() {
         return mContext;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
index e0550ec8..e4411b76 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/OwnCloudCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public interface OwnCloudCredentials {
+public interface OCCredentials {
 
     Map<String, String> getCredentialHeaders();
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
similarity index 75%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
index 28ef3cce..990415ba 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudAnonymousCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
@@ -1,11 +1,11 @@
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import java.util.HashMap;
 import java.util.Map;
-public class OwnCloudAnonymousCredentials implements OwnCloudCredentials {
+public class OCAnonymousCredentials implements OCCredentials {
 
     @Override
     public Map<String, String> getCredentialHeaders() {
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
similarity index 89%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
index a6813da0..ea00d184 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
@@ -23,20 +23,19 @@
  */
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import okhttp3.Authenticator;
 import okhttp3.Credentials;
 
-public class OwnCloudBasicCredentials implements OwnCloudCredentials {
+public class OCBasicCredentials implements OCCredentials {
 
     private String mUsername;
     private String mPassword;
 
-    public OwnCloudBasicCredentials(String username, String password) {
+    public OCBasicCredentials(String username, String password) {
         mUsername = username != null ? username : "";
         mPassword = password != null ? password : "";
     }
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
similarity index 89%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
index 2b7b4fe8..bd427738 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
@@ -25,20 +25,18 @@ package com.owncloud.android.lib.refactor.authentication.credentials;
 
 
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import okhttp3.Authenticator;
-
-public class OwnCloudBearerCredentials implements OwnCloudCredentials {
+public class OCBearerCredentials implements OCCredentials {
 
     private String mUsername;
 
     private String mAccessToken;
 
-    public OwnCloudBearerCredentials(String username, String accessToken) {
+    public OCBearerCredentials(String username, String accessToken) {
         mUsername = username != null ? username : "";
         mAccessToken = accessToken != null ? accessToken : "";
     }
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
similarity index 90%
rename from src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
index 5bd8e3a8..47ca012a 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
@@ -25,22 +25,20 @@ package com.owncloud.android.lib.refactor.authentication.credentials;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 import org.apache.commons.httpclient.Cookie;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
+public class OCSamlSsoCredentials implements OCCredentials {
 
     private final String mUsername;
     private final String mSessionCookie;
     private final Uri mBaseUrl;
 
-    public OwnCloudSamlSsoCredentials(String username, String sessionCookie, Uri baseUrl) {
+    public OCSamlSsoCredentials(String username, String sessionCookie, Uri baseUrl) {
         mUsername = username != null ? username : "";
         mSessionCookie = sessionCookie != null ? sessionCookie : "";
         mBaseUrl = baseUrl;
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
index 34241c42..ec9c3a41 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
@@ -28,14 +28,14 @@ package com.owncloud.android.lib.refactor.authentication.oauth;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2GetAccessTokenOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2RefreshAccessTokenOperation;
 
 public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
 
-    private OwnCloudContext ocContext;
+    private OCContext ocContext;
     private OwnCloudOAuth2Provider mOAuth2Provider;
 
     private OAuthRequest mRequest;
@@ -67,7 +67,7 @@ public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
         mRefreshToken = refreshToken;
     }
 
-    public void setOcContext(OwnCloudContext ocContext) {
+    public void setOcContext(OCContext ocContext) {
         this.ocContext = ocContext;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index d2b66226..0256e232 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -28,7 +28,7 @@ package com.owncloud.android.lib.refactor.authentication.oauth.operations;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
@@ -59,7 +59,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
 
 
     public OAuth2GetAccessTokenOperation(
-            OwnCloudContext context,
+            OCContext context,
             String grantType,
             String code,
             String clientId,
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index f9e4595f..18a6fa78 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -21,12 +21,12 @@
 
 package com.owncloud.android.lib.refactor.authentication.oauth.operations;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.RemoteOperation;
-import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudBasicCredentials;
-import com.owncloud.android.lib.refactor.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
@@ -55,7 +55,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
     private final OAuth2ResponseParser mResponseParser;
 
     public OAuth2RefreshAccessTokenOperation(
-            OwnCloudContext ocContext,
+            OCContext ocContext,
             String clientId,
             String secretId,
             String refreshToken,
@@ -98,7 +98,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
                     .build();
 
 
-            OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(
+            OCCredentials oauthCredentials = new OCBasicCredentials(
                     mClientId,
                     mClientSecret
             );
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index c9395a88..b43d4c52 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -1,12 +1,12 @@
 package com.owncloud.android.lib.refactor.operations;
 
-import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 
 public class PropfindOperation extends RemoteOperation {
 
-    public PropfindOperation(OwnCloudContext context) {
+    public PropfindOperation(OCContext context) {
         super(context);
     }
 

From 1249e205d671db5e8bc5d5fb7cfda1110b1f561a Mon Sep 17 00:00:00 2001
From: DerSchabi <chris.schabesberger@mailbox.org>
Date: Fri, 18 May 2018 12:21:47 +0200
Subject: [PATCH 003/133] add OCAccount

add OCAccount
---
 .../android/lib/refactor/OCContext.java       |  31 +---
 .../android/lib/refactor/RemoteOperation.java |  16 +-
 .../lib/refactor/RemoteOperationResult.java   |  10 +-
 .../{utils => account}/AccountTypeUtils.java  |   2 +-
 .../{utils => account}/AccountUtils.java      | 175 ++++++++----------
 .../lib/refactor/account/OCAccount.java       | 155 ++++++++++++++++
 .../OAuth2GetAccessTokenOperation.java        |  13 +-
 .../OAuth2RefreshAccessTokenOperation.java    |  11 +-
 .../exceptions/AccountNotFoundException.java  |  23 +++
 .../operations/PropfindOperation.java         |   1 +
 10 files changed, 289 insertions(+), 148 deletions(-)
 rename src/com/owncloud/android/lib/refactor/{utils => account}/AccountTypeUtils.java (97%)
 rename src/com/owncloud/android/lib/refactor/{utils => account}/AccountUtils.java (61%)
 create mode 100644 src/com/owncloud/android/lib/refactor/account/OCAccount.java
 create mode 100644 src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java

diff --git a/src/com/owncloud/android/lib/refactor/OCContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
index 9602f588..d8d0054c 100644
--- a/src/com/owncloud/android/lib/refactor/OCContext.java
+++ b/src/com/owncloud/android/lib/refactor/OCContext.java
@@ -2,6 +2,7 @@ package com.owncloud.android.lib.refactor;
 
 import android.net.Uri;
 
+import com.owncloud.android.lib.refactor.account.OCAccount;
 import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 
@@ -18,33 +19,13 @@ public class OCContext {
     private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
 
-    private OCCredentials mCredentials = null;
-    private Uri mBaseUri;
+    private OCAccount mOCAccount;
 
-    public class Builder {
-        OCContext ocContext = new OCContext();
-
-        public Builder setCredentials(OCCredentials credentials) {
-            ocContext.mCredentials = credentials;
-            return this;
-        }
-
-        public Builder setBaseUri(Uri baseUri) {
-            ocContext.mBaseUri = baseUri;
-            return this;
-        }
-
-        public OCContext build() {
-            return ocContext;
-        }
+    public OCContext(OCAccount account) {
+        mOCAccount = account;
     }
 
-
-    public OCCredentials getCredentials() {
-        return mCredentials;
-    }
-
-    public Uri getBaseUri() {
-        return mBaseUri;
+    public OCAccount getOCAccount() {
+        return mOCAccount;
     }
 }
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 50c23a06..4dff64e3 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,5 +1,7 @@
 package com.owncloud.android.lib.refactor;
 
+import android.net.Uri;
+
 import java.util.Map;
 
 import okhttp3.OkHttpClient;
@@ -29,16 +31,26 @@ public abstract class RemoteOperation {
         return httpClient;
     }
 
+    public Uri.Builder getBaseUriBuilder() {
+        return mContext.getOCAccount().getBaseUri().buildUpon();
+    }
+
     public Request.Builder getRequestBuilder() {
         Request.Builder builder = new Request.Builder();
 
         for(Map.Entry<String, String> header
-                : mContext.getCredentials().getCredentialHeaders().entrySet()) {
+                : mContext.getOCAccount()
+                .getCredentials()
+                .getCredentialHeaders()
+                .entrySet()) {
             builder.addHeader(header.getKey(), header.getValue());
         }
 
         //TODO: Remove this part once SAML is obsolet
-        final String credentialCookie = mContext.getCredentials().getCredentialCookie();
+        final String credentialCookie = mContext
+                .getOCAccount()
+                .getCredentials()
+                .getCredentialCookie();
         if(credentialCookie == null) {
             builder.addHeader("Cookie", credentialCookie);
         }
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java b/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
index 6f09bcba..eb89e0a3 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
@@ -27,7 +27,7 @@ package com.owncloud.android.lib.refactor;
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
-import com.owncloud.android.lib.refactor.utils.AccountUtils;
+import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 import com.owncloud.android.lib.refactor.exceptions.CertificateCombinedException;
 import com.owncloud.android.lib.refactor.exceptions.OperationCancelledException;
 import com.owncloud.android.lib.refactor.utils.ErrorMessageParser;
@@ -71,7 +71,7 @@ public class RemoteOperationResult implements Serializable {
     /**
      * Generated - should be refreshed every time the class changes!!
      */
-    private static final long serialVersionUID = 4968939884332372230L;
+    private static final long serialVersionUID = 4968939884332652230L;
 
     private static final String TAG = RemoteOperationResult.class.getSimpleName();
 
@@ -184,7 +184,7 @@ public class RemoteOperationResult implements Serializable {
         } else if (e instanceof UnknownHostException) {
             mCode = ResultCode.HOST_NOT_AVAILABLE;
 
-        } else if (e instanceof AccountUtils.AccountNotFoundException) {
+        } else if (e instanceof AccountNotFoundException) {
             mCode = ResultCode.ACCOUNT_NOT_FOUND;
 
         } else if (e instanceof AccountsException) {
@@ -444,9 +444,9 @@ public class RemoteOperationResult implements Serializable {
             if(mException instanceof DavException) return "Unexpected WebDAV exception";
             if(mException instanceof HttpException) return "HTTP violation";
             if(mException instanceof IOException) return "Unrecovered transport exception";
-            if(mException instanceof AccountUtils.AccountNotFoundException) {
+            if(mException instanceof AccountNotFoundException) {
                 Account failedAccount =
-                        ((AccountUtils.AccountNotFoundException) mException).getFailedAccount();
+                        ((AccountNotFoundException) mException).getFailedAccount();
                 return mException.getMessage() + " (" +
                         (failedAccount != null ? failedAccount.name : "NULL") + ")";
 
diff --git a/src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java
rename to src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java
index 92ab5662..009194e0 100644
--- a/src/com/owncloud/android/lib/refactor/utils/AccountTypeUtils.java
+++ b/src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.utils;
+package com.owncloud.android.lib.refactor.account;
 
 /**
  * @author masensio
diff --git a/src/com/owncloud/android/lib/refactor/utils/AccountUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
similarity index 61%
rename from src/com/owncloud/android/lib/refactor/utils/AccountUtils.java
rename to src/com/owncloud/android/lib/refactor/account/AccountUtils.java
index e5d54fe1..833a9bd9 100644
--- a/src/com/owncloud/android/lib/refactor/utils/AccountUtils.java
+++ b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.utils;
+package com.owncloud.android.lib.refactor.account;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -33,16 +33,23 @@ import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.refactor.Log_OC;
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCBearerCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCSamlSsoCredentials;
+import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.auth.AuthenticationException;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Cookie;
 
 public class AccountUtils {
 
@@ -59,7 +66,7 @@ public class AccountUtils {
     public static String getWebDavUrlForAccount(Context context, Account account)
         throws AccountNotFoundException {
 
-        return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_PATH_4_0;
+        return getBaseUrlForAccount(context, account) + OCContext.WEBDAV_PATH_4_0;
     }
 
 
@@ -121,73 +128,65 @@ public class AccountUtils {
     }
 
     /**
-     * @return
+     * @return OCCredentials
      * @throws IOException
      * @throws AuthenticatorException
      * @throws OperationCanceledException
      */
-    public static OwnCloudCredentials getCredentialsForAccount(Context context, Account account)
+
+    /**
+     *
+     * @param context an Android context
+     * @param account the coresponding Android account
+     * @return
+     * @throws OperationCanceledException
+     * @throws AuthenticatorException
+     * @throws IOException
+     */
+    public static OCCredentials getCredentialsForAccount(Context context, Account account)
         throws OperationCanceledException, AuthenticatorException, IOException {
 
-        OwnCloudCredentials credentials = null;
-        AccountManager am = AccountManager.get(context);
-
-        String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
-        boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE");
-
+        final AccountManager am = AccountManager.get(context);
+        final String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
+        final boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE");
         String supportsSamlSSo = am.getUserData(account,
                 AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO);
-
-        boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE");
-
-        String username = AccountUtils.getUsernameForAccount(account);
-        OwnCloudVersion version = new OwnCloudVersion(am.getUserData(account, Constants.KEY_OC_VERSION));
+        final boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE");
+        final String username = AccountUtils.getUsernameForAccount(account);
 
         if (isOauth2) {
-            String accessToken = am.blockingGetAuthToken(
+            final String accessToken = am.blockingGetAuthToken(
                 account,
                 AccountTypeUtils.getAuthTokenTypeAccessToken(account.type),
                 false);
 
-            credentials = OwnCloudCredentialsFactory.newBearerCredentials(username, accessToken);
+            return new OCBearerCredentials(username, accessToken);
 
         } else if (isSamlSso) {
-            String accessToken = am.blockingGetAuthToken(
-                account,
-                AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(account.type),
-                false);
 
-            credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(username, accessToken);
+            try {
+                final String accessToken = am.blockingGetAuthToken(
+                        account,
+                        AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(account.type),
+                        false);
+
+                return new OCSamlSsoCredentials(username, accessToken,
+                        Uri.parse(getBaseUrlForAccount(context, account)));
+            } catch (AccountNotFoundException e) {
+                throw new AuthenticationException("Account not found", e);
+            }
 
         } else {
-            String password = am.blockingGetAuthToken(
+            final String password = am.blockingGetAuthToken(
                 account,
                 AccountTypeUtils.getAuthTokenTypePass(account.type),
                 false);
 
-            credentials = OwnCloudCredentialsFactory.newBasicCredentials(
-                username,
-                password,
-                version.isPreemptiveAuthenticationPreferred()
-            );
+            return new OCBasicCredentials(username, password);
         }
-
-        return credentials;
-
     }
 
 
-    public static String buildAccountNameOld(Uri serverBaseUrl, String username) {
-        if (serverBaseUrl.getScheme() == null) {
-            serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
-        }
-        String accountName = username + "@" + serverBaseUrl.getHost();
-        if (serverBaseUrl.getPort() >= 0) {
-            accountName += ":" + serverBaseUrl.getPort();
-        }
-        return accountName;
-    }
-
     public static String buildAccountName(Uri serverBaseUrl, String username) {
         if (serverBaseUrl.getScheme() == null) {
             serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
@@ -203,80 +202,60 @@ public class AccountUtils {
         return accountName;
     }
 
-    public static void saveClient(OwnCloudClient client, Account savedAccount, Context context) {
+    public static void saveCookies(List<Cookie> cookies, Account savedAccount, Context context) {
 
         // Account Manager
         AccountManager ac = AccountManager.get(context.getApplicationContext());
 
-        if (client != null) {
-            String cookiesString = client.getCookiesString();
-            if (!"".equals(cookiesString)) {
-                ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString);
-                // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
+        if (cookies != null && cookies.size() != 0) {
+            StringBuilder cookiesString = new StringBuilder();
+            for (Cookie cookie : cookies) {
+                cookiesString.append(cookiesString + cookie.toString() + ";");
             }
+
+            ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString.toString());
         }
 
     }
 
 
     /**
-     * Restore the client cookies persisted in an account stored in the system AccountManager.
+     *  Restore the client cookies persisted in an account stored in the system AccountManager.
      *
-     * @param account           Stored account.
-     * @param client            Client to restore cookies in.
-     * @param context           Android context used to access the system AccountManager.
+     * @param account
+     * @param context
+     * @return
+     * @throws AccountsException
      */
-    public static void restoreCookies(Account account, OwnCloudClient client, Context context) {
+    public static List<Cookie> getCookiesFromAccount(Account account, Context context) throws AccountsException {
         if (account == null) {
             Log_OC.d(TAG, "Cannot restore cookie for null account");
+            return new ArrayList<>();
+        }
 
-        } else {
-            Log_OC.d(TAG, "Restoring cookies for " + account.name);
+        Log_OC.d(TAG, "Restoring cookies for " + account.name);
 
-            // Account Manager
-            AccountManager am = AccountManager.get(context.getApplicationContext());
+        final AccountManager am = AccountManager.get(context.getApplicationContext());
+        final Uri serverUri = Uri.parse(getBaseUrlForAccount(context, account));
+        final String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
+        final List<Cookie> cookies = new ArrayList<>();
 
-            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getWebdavUri();
+        if (cookiesString != null) {
+            String[] rawCookies = cookiesString.split(";");
+            for (String rawCookie : rawCookies) {
+                final int equalPos = rawCookie.indexOf('=');
 
-            String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
-            if (cookiesString != null) {
-                String[] cookies = cookiesString.split(";");
-                if (cookies.length > 0) {
-                    for (int i = 0; i < cookies.length; i++) {
-                        Cookie cookie = new Cookie();
-                        int equalPos = cookies[i].indexOf('=');
-                        cookie.setName(cookies[i].substring(0, equalPos));
-                        cookie.setValue(cookies[i].substring(equalPos + 1));
-                        cookie.setDomain(serverUri.getHost());    // VERY IMPORTANT
-                        cookie.setPath(serverUri.getPath());    // VERY IMPORTANT
-
-                        client.getState().addCookie(cookie);
-                    }
-                }
+                cookies.add(new Cookie.Builder()
+                        .name(rawCookie.substring(0, equalPos))
+                        .value(rawCookie.substring(equalPos + 1))
+                        .domain(serverUri.getHost())
+                        .path(serverUri.getPath())
+                        .build());
             }
         }
+        return cookies;
     }
 
-    public static class AccountNotFoundException extends AccountsException {
-
-        /**
-         * Generated - should be refreshed every time the class changes!!
-         */
-        private static final long serialVersionUID = -1684392454798508693L;
-
-        private Account mFailedAccount;
-
-        public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {
-            super(message, cause);
-            mFailedAccount = failedAccount;
-        }
-
-        public Account getFailedAccount() {
-            return mFailedAccount;
-        }
-    }
-
-
     public static class Constants {
         /**
          * Version should be 3 numbers separated by dot so it can be parsed by
diff --git a/src/com/owncloud/android/lib/refactor/account/OCAccount.java b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
new file mode 100644
index 00000000..4349547d
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
@@ -0,0 +1,155 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.account;
+
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.Context;
+import android.net.Uri;
+
+import com.owncloud.android.lib.refactor.authentication.OCCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCAnonymousCredentials;
+import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
+
+import java.io.IOException;
+
+/**
+ * OwnCloud Account
+ * 
+ * @author David A. Velasco
+ */
+public class OCAccount {
+
+    private Uri mBaseUri;
+    private OCCredentials mCredentials;
+    private String mDisplayName;
+    private String mSavedAccountName;
+    private Account mSavedAccount;
+
+
+    /**
+     * Constructor for already saved OC accounts.
+     *
+     * Do not use for anonymous credentials.
+     */
+    public OCAccount(Account savedAccount, Context context) throws AccountNotFoundException {
+        if (savedAccount == null) {
+            throw new IllegalArgumentException("Parameter 'savedAccount' cannot be null");
+        }
+
+        if (context == null) {
+            throw new IllegalArgumentException("Parameter 'context' cannot be null");
+        }
+
+        mSavedAccount = savedAccount;
+        mSavedAccountName = savedAccount.name;
+        mCredentials = null;    // load of credentials is delayed
+
+        AccountManager ama = AccountManager.get(context.getApplicationContext());
+        String baseUrl = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_OC_BASE_URL);
+        if (baseUrl == null ) {
+            throw new AccountNotFoundException(mSavedAccount, "Account not found", null);
+        }
+        mBaseUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, mSavedAccount));
+        mDisplayName = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_DISPLAY_NAME);
+    }
+
+
+    /**
+     * Constructor for non yet saved OC accounts.
+     *
+     * @param baseUri           URI to the OC server to get access to.
+     * @param credentials       Credentials to authenticate in the server. NULL is valid for anonymous credentials.
+     */
+    public OCAccount(Uri baseUri, OCCredentials credentials) {
+        if (baseUri == null) {
+            throw new IllegalArgumentException("Parameter 'baseUri' cannot be null");
+        }
+        mSavedAccount = null;
+        mSavedAccountName = null;
+        mBaseUri = baseUri;
+        mCredentials = credentials != null
+                ? credentials
+                : new OCAnonymousCredentials();
+        String username = mCredentials.getUsername();
+        if (username != null) {
+            mSavedAccountName = AccountUtils.buildAccountName(mBaseUri, username);
+        }
+    }
+
+    /**
+     * Method for deferred load of account attributes from AccountManager
+     *
+     * @param context
+     * @throws AccountNotFoundException
+     * @throws AuthenticatorException
+     * @throws IOException
+     * @throws OperationCanceledException
+     */
+    public void loadCredentials(Context context)
+        throws AccountNotFoundException, AuthenticatorException,
+                IOException, OperationCanceledException {
+
+        if (context == null) {
+            throw new IllegalArgumentException("Parameter 'context' cannot be null");
+        }
+
+        if (mSavedAccount != null) {
+            mCredentials = AccountUtils.getCredentialsForAccount(context, mSavedAccount);
+        }
+    }
+
+    public Uri getBaseUri() {
+        return mBaseUri;
+    }
+            
+    public OCCredentials getCredentials() {
+        return mCredentials;
+    }
+    
+    public String getName() {
+    	return mSavedAccountName;
+    }
+
+    public Account getSavedAccount() {
+        return mSavedAccount;
+    }
+
+    public String getDisplayName() {
+        if (mDisplayName != null && mDisplayName.length() > 0) {
+            return mDisplayName;
+        } else if (mCredentials != null) {
+            return mCredentials.getUsername();
+        } else if (mSavedAccount != null) {
+            return AccountUtils.getUsernameForAccount(mSavedAccount);
+        } else {
+            return null;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index 0256e232..8a30f7db 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -84,13 +84,6 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
     @Override
     public RemoteOperationResult exec() {
         try {
-
-            final Uri uri = getOCContext()
-                    .getBaseUri()
-                    .buildUpon()
-                    .appendEncodedPath(mAccessTokenEndpointPath)
-                    .build();
-
             final RequestBody requestBody = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM)
                     .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE, mGrantType)
@@ -100,7 +93,10 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
                     .build();
 
             final Request request = getRequestBuilder()
-                    .url(uri.toString())
+                    .url(getBaseUriBuilder()
+                            .appendEncodedPath(mAccessTokenEndpointPath)
+                            .build()
+                            .toString())
                     .method("POST", requestBody)
                     .build();
 
@@ -109,6 +105,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
                     .execute();
 
             final String responseData = response.body().string();
+            
             if (responseData != null && responseData.length() > 0) {
                 JSONObject tokenJson = new JSONObject(responseData);
                 Map<String, String> accessTokenResult =
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index 18a6fa78..780ec71d 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -79,8 +79,6 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
     @Override
     public RemoteOperationResult exec() {
         try {
-
-
             final RequestBody requestBody = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM)
                     .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE,
@@ -90,20 +88,15 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
                     .build();
 
             final Request request = getRequestBuilder()
-                    .url(getOCContext().getBaseUri().buildUpon()
+                    .url(getBaseUriBuilder()
                             .appendEncodedPath(mAccessTokenEndpointPath)
                             .build()
                             .toString())
                     .method("POST", requestBody)
                     .build();
 
-
-            OCCredentials oauthCredentials = new OCBasicCredentials(
-                    mClientId,
-                    mClientSecret
-            );
-
             final Response response = getClient().newCall(request).execute();
+
             final String responseData = response.body().string();
             Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + responseData);
 
diff --git a/src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java b/src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java
new file mode 100644
index 00000000..fd1bfd6c
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java
@@ -0,0 +1,23 @@
+package com.owncloud.android.lib.refactor.exceptions;
+
+import android.accounts.Account;
+import android.accounts.AccountsException;
+
+public class AccountNotFoundException extends AccountsException {
+
+    /**
+     * Generated - should be refreshed every time the class changes!!
+     */
+    private static final long serialVersionUID = -1684392454778508693L;
+
+    private Account mFailedAccount;
+
+    public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {
+        super(message, cause);
+        mFailedAccount = failedAccount;
+    }
+
+    public Account getFailedAccount() {
+        return mFailedAccount;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index b43d4c52..5a48b76b 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -13,6 +13,7 @@ public class PropfindOperation extends RemoteOperation {
     @Override
     public RemoteOperationResult exec() {
 
+
         return null;
     }
 }

From 3125c8047c051aec4f7a5ac55234b53f68a4ea8c Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 18 May 2018 12:18:42 +0200
Subject: [PATCH 004/133] First propfind using dav4droid and new architecture

---
 .../lib/sampleclient/MainActivity.java        | 38 ++++++---
 .../android/lib/refactor/OCContext.java       |  3 -
 .../android/lib/refactor/OwnCloudContext.java | 53 ++++++++++++
 .../android/lib/refactor/RemoteOperation.java |  3 +-
 .../lib/refactor/account/AccountUtils.java    |  3 +-
 .../lib/refactor/account/OCAccount.java       |  3 +-
 .../credentials/OCAnonymousCredentials.java   | 10 ++-
 .../credentials/OCBasicCredentials.java       | 10 ++-
 .../credentials/OCBearerCredentials.java      | 10 +--
 .../{ => credentials}/OCCredentials.java      | 13 ++-
 .../credentials/OCSamlSsoCredentials.java     |  5 +-
 .../OwnCloudCredentialsFactory.java           | 85 +++++++++++++++++++
 .../OAuth2RefreshAccessTokenOperation.java    |  2 -
 .../operations/PropfindOperation.java         | 31 ++++++-
 14 files changed, 220 insertions(+), 49 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/refactor/OwnCloudContext.java
 rename src/com/owncloud/android/lib/refactor/authentication/{ => credentials}/OCCredentials.java (90%)
 create mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 6ac5efd8..5b7d1b13 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -35,8 +35,10 @@ import java.util.List;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.refactor.OwnCloudContext;
+import com.owncloud.android.lib.refactor.operations.PropfindOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -64,7 +66,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	
 	private Handler mHandler;
 	
-	private OwnCloudClient mClient; 
+	private OwnCloudClient mClient;
+
+	private OwnCloudContext mOCContext;
 	
 	private FilesArrayAdapter mFilesAdapter;
 	
@@ -79,13 +83,21 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         mHandler = new Handler();
         
     	Uri serverUri = Uri.parse(getString(R.string.server_base_url));
-    	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
-    	mClient.setCredentials(
-    			OwnCloudCredentialsFactory.newBasicCredentials(
-    					getString(R.string.username), 
-    					getString(R.string.password)
-				)
-		);
+//    	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
+//    	mClient.setCredentials(
+//    			OwnCloudCredentialsFactory.newBasicCredentials(
+//    					getString(R.string.username),
+//    					getString(R.string.password)
+//				)
+//		);
+
+    	mOCContext = new OwnCloudContext.Builder()
+                .setBaseUri(serverUri)
+                .setCredentials(OwnCloudCredentialsFactory.newBasicCredentials(
+                        getString(R.string.username),
+                        getString(R.string.password)
+                ))
+                .build();
     	
     	mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
     	((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
@@ -148,8 +160,12 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     }
 
     private void startRefresh() {
-    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
-    	refreshOperation.execute(mClient, this, mHandler);
+
+		PropfindOperation propfindOperation = new PropfindOperation(mOCContext, FileUtils.PATH_SEPARATOR);
+
+		propfindOperation.exec();
+//    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
+//    	refreshOperation.execute(mClient, this, mHandler);
     }
     
     private void startUpload() {
diff --git a/src/com/owncloud/android/lib/refactor/OCContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
index d8d0054c..f3cc216b 100644
--- a/src/com/owncloud/android/lib/refactor/OCContext.java
+++ b/src/com/owncloud/android/lib/refactor/OCContext.java
@@ -1,9 +1,6 @@
 package com.owncloud.android.lib.refactor;
 
-import android.net.Uri;
-
 import com.owncloud.android.lib.refactor.account.OCAccount;
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 
 
 public class OCContext {
diff --git a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java b/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
new file mode 100644
index 00000000..008b10e0
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
@@ -0,0 +1,53 @@
+package com.owncloud.android.lib.refactor;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
+
+
+public class OwnCloudContext {
+    private static final String TAG = OwnCloudContext.class.toString();
+
+    public static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
+    public static final String STATUS_PATH = "/status.php";
+    public static final String FILES_WEB_PATH = "/index.php/apps/files";
+
+    private static final int MAX_REDIRECTIONS_COUNT = 3;
+    private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
+    private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
+    private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
+    private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
+
+    private OCCredentials mCredentials = null;
+    private Uri mBaseUri;
+
+    public static final class Builder {
+        OwnCloudContext ocContext = new OwnCloudContext();
+
+        public Builder setCredentials(OCCredentials credentials) {
+            ocContext.mCredentials = credentials;
+            return this;
+        }
+
+        public Builder setBaseUri(Uri baseUri) {
+            ocContext.mBaseUri = baseUri;
+            return this;
+        }
+
+        public OwnCloudContext build() {
+            return ocContext;
+        }
+    }
+
+    public OCCredentials getCredentials() {
+        return mCredentials;
+    }
+
+    public Uri getBaseUri() {
+        return mBaseUri;
+    }
+
+    public Uri getWebdavUri() {
+        return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 4dff64e3..18504069 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,7 +1,6 @@
 package com.owncloud.android.lib.refactor;
 
 import android.net.Uri;
-
 import java.util.Map;
 
 import okhttp3.OkHttpClient;
@@ -57,4 +56,4 @@ public abstract class RemoteOperation {
 
         return builder;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
index 833a9bd9..26e2e21e 100644
--- a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
+++ b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
@@ -33,12 +33,11 @@ import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBearerCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCSamlSsoCredentials;
 import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
diff --git a/src/com/owncloud/android/lib/refactor/account/OCAccount.java b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
index 4349547d..bd40521c 100644
--- a/src/com/owncloud/android/lib/refactor/account/OCAccount.java
+++ b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
@@ -24,7 +24,6 @@
 
 package com.owncloud.android.lib.refactor.account;
 
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
@@ -32,8 +31,8 @@ import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCAnonymousCredentials;
+import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
 import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 
 import java.io.IOException;
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
index 990415ba..fa0d04c5 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
@@ -1,8 +1,5 @@
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
-
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
-
 import java.util.HashMap;
 import java.util.Map;
 public class OCAnonymousCredentials implements OCCredentials {
@@ -12,6 +9,11 @@ public class OCAnonymousCredentials implements OCCredentials {
         return new HashMap<>(0);
     }
 
+    @Override
+    public String getCredentialCookie() {
+        return null;
+    }
+
     @Override
     public String getUsername() {
         return "";
@@ -26,4 +28,4 @@ public class OCAnonymousCredentials implements OCCredentials {
     public boolean authTokenCanBeRefreshed() {
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
index ea00d184..abb2b27b 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
@@ -23,8 +23,6 @@
  */
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -47,6 +45,11 @@ public class OCBasicCredentials implements OCCredentials {
         return header;
     }
 
+    @Override
+    public String getCredentialCookie() {
+        return null;
+    }
+
     @Override
     public String getUsername() {
         return mUsername;
@@ -61,5 +64,4 @@ public class OCBasicCredentials implements OCCredentials {
     public boolean authTokenCanBeRefreshed() {
         return false;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
index bd427738..92f35689 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
@@ -23,17 +23,12 @@
  */
 package com.owncloud.android.lib.refactor.authentication.credentials;
 
-
-
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
-
 import java.util.HashMap;
 import java.util.Map;
 
 public class OCBearerCredentials implements OCCredentials {
 
     private String mUsername;
-
     private String mAccessToken;
 
     public OCBearerCredentials(String username, String accessToken) {
@@ -48,6 +43,11 @@ public class OCBearerCredentials implements OCCredentials {
         return header;
     }
 
+    @Override
+    public String getCredentialCookie() {
+        return null;
+    }
+
     @Override
     public String getUsername() {
         // not relevant for authentication, but relevant for informational purposes
diff --git a/src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java
similarity index 90%
rename from src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
rename to src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java
index e4411b76..63ff805b 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/OCCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java
@@ -22,23 +22,20 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.authentication;
+package com.owncloud.android.lib.refactor.authentication.credentials;
 
-
-import java.util.HashMap;
 import java.util.Map;
 
-
 public interface OCCredentials {
 
     Map<String, String> getCredentialHeaders();
 
     //TODO: Remove this once SAML is obsolet
-    default String getCredentialCookie() {
-        return null;
-    }
+    String getCredentialCookie();
 
     String getUsername();
+
     String getAuthToken();
+
     boolean authTokenCanBeRefreshed();
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
index 47ca012a..b974a79c 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
@@ -25,10 +25,7 @@ package com.owncloud.android.lib.refactor.authentication.credentials;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
-
 import org.apache.commons.httpclient.Cookie;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -85,4 +82,4 @@ public class OCSamlSsoCredentials implements OCCredentials {
         return false;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java
new file mode 100644
index 00000000..3bcc1ef6
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java
@@ -0,0 +1,85 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.authentication.credentials;
+
+import java.util.Map;
+
+public class OwnCloudCredentialsFactory {
+
+    public static final String CREDENTIAL_CHARSET = "UTF-8";
+
+    private static OCAnonymousCredentials sAnonymousCredentials;
+
+    public static OCCredentials newBasicCredentials(String username, String password) {
+        return new OCBasicCredentials(username, password);
+    }
+
+    public static OCCredentials newBearerCredentials(String username, String authToken) {
+        return new OCBearerCredentials(username, authToken);
+    }
+
+    public static OCCredentials newSamlSsoCredentials(String username, String sessionCookie) {
+        return new OCSamlSsoCredentials(username, sessionCookie, null);
+    }
+
+    public static final OCCredentials getAnonymousCredentials() {
+        if (sAnonymousCredentials == null) {
+            sAnonymousCredentials = new OCAnonymousCredentials();
+        }
+        return sAnonymousCredentials;
+    }
+
+    public static final class OCAnonymousCredentials implements OCCredentials {
+
+        protected OCAnonymousCredentials() {
+        }
+
+        @Override
+        public String getAuthToken() {
+            return "";
+        }
+
+        @Override
+        public boolean authTokenCanBeRefreshed() {
+            return false;
+        }
+
+        @Override
+        public Map<String, String> getCredentialHeaders() {
+            return null;
+        }
+
+        @Override
+        public String getCredentialCookie() {
+            return null;
+        }
+
+        @Override
+        public String getUsername() {
+            // no user name
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index 780ec71d..78e67e47 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -25,8 +25,6 @@ import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.RemoteOperation;
-import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
-import com.owncloud.android.lib.refactor.authentication.OCCredentials;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index 5a48b76b..f07f1337 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -1,19 +1,46 @@
 package com.owncloud.android.lib.refactor.operations;
 
 import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import java.io.IOException;
+
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.property.DisplayName;
+import okhttp3.HttpUrl;
 
 public class PropfindOperation extends RemoteOperation {
 
-    public PropfindOperation(OCContext context) {
+    private String mRemotePath;
+
+    public PropfindOperation(OCContext context, String remotePath) {
         super(context);
+
+        mRemotePath = remotePath;
     }
 
     @Override
     public RemoteOperationResult exec() {
+        DavResource davResource = new DavResource(
+                getClient(),
+                HttpUrl.parse(getOCContext().getWebdavUri() + WebdavUtils.encodePath(mRemotePath)),
+                null);
 
+        try {
+            davResource.propfind(1, DisplayName.NAME);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (HttpException e) {
+            e.printStackTrace();
+        } catch (DavException e) {
+            e.printStackTrace();
+        }
+
+        davResource.getProperties();
 
         return null;
     }
-}
+}
\ No newline at end of file

From ff6adc4cf9254bfc046d06de83398e4964c4e2d2 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 18 May 2018 14:12:37 +0200
Subject: [PATCH 005/133] Solve conflicts

---
 .../lib/sampleclient/MainActivity.java        | 24 ++++++++++---------
 .../android/lib/refactor/OCContext.java       |  3 +--
 .../android/lib/refactor/RemoteOperation.java | 13 ++++++----
 .../lib/refactor/account/OCAccount.java       |  1 -
 .../OAuth2GetAccessTokenOperation.java        |  4 +---
 .../operations/PropfindOperation.java         |  2 +-
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 5b7d1b13..d63484d1 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -35,6 +35,8 @@ import java.util.List;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.account.OCAccount;
 import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 import com.owncloud.android.lib.refactor.OwnCloudContext;
@@ -68,7 +70,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	
 	private OwnCloudClient mClient;
 
-	private OwnCloudContext mOCContext;
+	private OCContext mOCContext;
 	
 	private FilesArrayAdapter mFilesAdapter;
 	
@@ -83,7 +85,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         mHandler = new Handler();
         
     	Uri serverUri = Uri.parse(getString(R.string.server_base_url));
-//    	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
+    	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
 //    	mClient.setCredentials(
 //    			OwnCloudCredentialsFactory.newBasicCredentials(
 //    					getString(R.string.username),
@@ -91,13 +93,14 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 //				)
 //		);
 
-    	mOCContext = new OwnCloudContext.Builder()
-                .setBaseUri(serverUri)
-                .setCredentials(OwnCloudCredentialsFactory.newBasicCredentials(
-                        getString(R.string.username),
-                        getString(R.string.password)
-                ))
-                .build();
+		OCAccount ocAccount = new OCAccount(serverUri,
+				OwnCloudCredentialsFactory.newBasicCredentials(
+    					getString(R.string.username),
+    					getString(R.string.password)
+				)
+		);
+
+    	mOCContext = new OCContext(ocAccount);
     	
     	mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
     	((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
@@ -293,5 +296,4 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
             }
         });
 	}
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/OCContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
index f3cc216b..aebffa92 100644
--- a/src/com/owncloud/android/lib/refactor/OCContext.java
+++ b/src/com/owncloud/android/lib/refactor/OCContext.java
@@ -2,7 +2,6 @@ package com.owncloud.android.lib.refactor;
 
 import com.owncloud.android.lib.refactor.account.OCAccount;
 
-
 public class OCContext {
     private static final String TAG = OCContext.class.toString();
 
@@ -25,4 +24,4 @@ public class OCContext {
     public OCAccount getOCAccount() {
         return mOCAccount;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 18504069..d72b1682 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -9,6 +9,7 @@ import okhttp3.Request;
 public abstract class RemoteOperation {
     private final OCContext mContext;
     private static OkHttpClient httpClient = null;
+    private static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
 
     protected RemoteOperation(OCContext context) {
         mContext = context;
@@ -22,19 +23,23 @@ public abstract class RemoteOperation {
 
     public abstract RemoteOperationResult exec();
 
-    public OCContext getOCContext() {
+    protected OCContext getOCContext() {
         return mContext;
     }
 
-    public OkHttpClient getClient() {
+    protected OkHttpClient getClient() {
         return httpClient;
     }
 
-    public Uri.Builder getBaseUriBuilder() {
+    protected Uri.Builder getBaseUriBuilder() {
         return mContext.getOCAccount().getBaseUri().buildUpon();
     }
 
-    public Request.Builder getRequestBuilder() {
+    protected Uri.Builder getWebDAVUriBuilder() {
+        return getBaseUriBuilder().appendEncodedPath(WEBDAV_PATH_4_0);
+    }
+
+    protected Request.Builder getRequestBuilder() {
         Request.Builder builder = new Request.Builder();
 
         for(Map.Entry<String, String> header
diff --git a/src/com/owncloud/android/lib/refactor/account/OCAccount.java b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
index bd40521c..ab9c2618 100644
--- a/src/com/owncloud/android/lib/refactor/account/OCAccount.java
+++ b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
@@ -150,5 +150,4 @@ public class OCAccount {
             return null;
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index 8a30f7db..495315bd 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -54,10 +54,8 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
     private final String mClientSecret;
     private final String mRedirectUri;
     private final String mAccessTokenEndpointPath;
-
     private final OAuth2ResponseParser mResponseParser;
 
-
     public OAuth2GetAccessTokenOperation(
             OCContext context,
             String grantType,
@@ -130,4 +128,4 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
             return new RemoteOperationResult(e);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index f07f1337..12de7e93 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -26,7 +26,7 @@ public class PropfindOperation extends RemoteOperation {
     public RemoteOperationResult exec() {
         DavResource davResource = new DavResource(
                 getClient(),
-                HttpUrl.parse(getOCContext().getWebdavUri() + WebdavUtils.encodePath(mRemotePath)),
+                HttpUrl.parse(getWebDAVUriBuilder() + WebdavUtils.encodePath(mRemotePath)),
                 null);
 
         try {

From d593474113362fcd6abc5f6d550d86ee0999cbd4 Mon Sep 17 00:00:00 2001
From: DerSchabi <chris.schabesberger@mailbox.org>
Date: Mon, 21 May 2018 11:09:31 +0200
Subject: [PATCH 006/133] make dav4android as submodule

---
 .gitmodules     | 3 +++
 build.gradle    | 3 +--
 dav4android     | 1 +
 settings.gradle | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 dav4android

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..e6e5b2b2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dav4android"]
+	path = dav4android
+	url = https://gitlab.com/derSchabi/dav4android.git
diff --git a/build.gradle b/build.gradle
index 46e813f9..bd256738 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,14 +14,13 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
     }
 }
 
 dependencies {
     api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
     api 'com.squareup.okhttp3:okhttp:3.10.0'
-    api 'com.gitlab.derSchabi:dav4android:dev2'
+    api project(':dav4android')
 }
 
 android {
diff --git a/dav4android b/dav4android
new file mode 160000
index 00000000..c73ea80b
--- /dev/null
+++ b/dav4android
@@ -0,0 +1 @@
+Subproject commit c73ea80bcbd6fd75379f88f497668eb9412d5490
diff --git a/settings.gradle b/settings.gradle
index 2ca75571..44a27a15 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
 include ':'
 include ':sample_client'
 include ':test_client'
+include ':dav4android'
\ No newline at end of file

From ca2eff664784dfeae2e2fe68ce4ec40f96289f79 Mon Sep 17 00:00:00 2001
From: DerSchabi <chris.schabesberger@mailbox.org>
Date: Tue, 22 May 2018 09:36:30 +0200
Subject: [PATCH 007/133] make propfind operation run without errors

---
 dav4android                                   |  2 +-
 res/values/empty.xml                          | 26 ----------
 sample_client/res/values/setup.xml            |  6 +--
 .../lib/sampleclient/MainActivity.java        | 17 ++-----
 .../android/lib/refactor/RemoteOperation.java | 50 +++++++++++++++----
 .../lib/refactor/account/OCAccount.java       |  6 ++-
 .../operations/PropfindOperation.java         | 21 ++++----
 7 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 res/values/empty.xml

diff --git a/dav4android b/dav4android
index c73ea80b..9b39bb9d 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit c73ea80bcbd6fd75379f88f497668eb9412d5490
+Subproject commit 9b39bb9d05bf27510ceeee105fb6edc2068fe8e2
diff --git a/res/values/empty.xml b/res/values/empty.xml
deleted file mode 100644
index e999cb06..00000000
--- a/res/values/empty.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2016 ownCloud GmbH.
-    
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-   
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-   
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
- -->
- 
-<resources/>
diff --git a/sample_client/res/values/setup.xml b/sample_client/res/values/setup.xml
index b6662b75..02fdda52 100644
--- a/sample_client/res/values/setup.xml
+++ b/sample_client/res/values/setup.xml
@@ -24,8 +24,8 @@
  -->
  
 <resources>
-    <string name="server_base_url"></string>
-    <string name="username"></string>
-    <string name="password"></string>
+    <string name="server_base_url">http://docker.oc.solidgear.es:11917/</string>
+    <string name="username">admin</string>
+    <string name="password">Password</string>
     <string name ="user_agent">Mozilla/5.0 (Android) ownCloud sample </string>
 </resources>
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index d63484d1..81777161 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -84,21 +84,14 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         
         mHandler = new Handler();
         
-    	Uri serverUri = Uri.parse(getString(R.string.server_base_url));
+    	final Uri serverUri = Uri.parse(getString(R.string.server_base_url));
     	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
-//    	mClient.setCredentials(
-//    			OwnCloudCredentialsFactory.newBasicCredentials(
-//    					getString(R.string.username),
-//    					getString(R.string.password)
-//				)
-//		);
+
 
 		OCAccount ocAccount = new OCAccount(serverUri,
 				OwnCloudCredentialsFactory.newBasicCredentials(
     					getString(R.string.username),
-    					getString(R.string.password)
-				)
-		);
+    					getString(R.string.password)));
 
     	mOCContext = new OCContext(ocAccount);
     	
@@ -164,9 +157,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
     private void startRefresh() {
 
-		PropfindOperation propfindOperation = new PropfindOperation(mOCContext, FileUtils.PATH_SEPARATOR);
+		final PropfindOperation propfindOperation = new PropfindOperation(mOCContext, FileUtils.PATH_SEPARATOR);
 
-		propfindOperation.exec();
+		Thread tread = new Thread(() -> propfindOperation.exec());
 //    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
 //    	refreshOperation.execute(mClient, this, mHandler);
     }
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index d72b1682..cb53b6e2 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,21 +1,25 @@
 package com.owncloud.android.lib.refactor;
 
 import android.net.Uri;
+
+import java.io.IOException;
 import java.util.Map;
 
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Response;
 
 public abstract class RemoteOperation {
     private final OCContext mContext;
-    private static OkHttpClient httpClient = null;
     private static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
+    private static OkHttpClient mClient = null;
 
     protected RemoteOperation(OCContext context) {
         mContext = context;
-
-        if(httpClient == null) {
-            httpClient = new OkHttpClient.Builder()
+        if(mClient == null) {
+            mClient = new OkHttpClient.Builder()
                     .followRedirects(false)
                     .build();
         }
@@ -28,19 +32,46 @@ public abstract class RemoteOperation {
     }
 
     protected OkHttpClient getClient() {
-        return httpClient;
+        return mClient.newBuilder()
+                .addInterceptor(chain ->
+                        chain.proceed(
+                                addRequestCredentials(
+                                        chain.request())
+                                        .build()))
+                .followRedirects(false)
+                .build();
     }
 
     protected Uri.Builder getBaseUriBuilder() {
         return mContext.getOCAccount().getBaseUri().buildUpon();
     }
 
-    protected Uri.Builder getWebDAVUriBuilder() {
-        return getBaseUriBuilder().appendEncodedPath(WEBDAV_PATH_4_0);
+    protected Uri getWebDavUrl() {
+        return getBaseUriBuilder().appendEncodedPath(WEBDAV_PATH_4_0).build();
+    }
+
+    protected Uri getWebDavUri(String resourcePath) {
+        return getBaseUriBuilder()
+                .appendEncodedPath(WEBDAV_PATH_4_0)
+                .appendEncodedPath(resourcePath)
+                .build();
+    }
+
+    protected HttpUrl getWebDavHttpUrl(String resourcePath) {
+        return HttpUrl.parse(
+                getBaseUriBuilder()
+                .appendEncodedPath(WEBDAV_PATH_4_0)
+                .appendEncodedPath(resourcePath)
+                .build()
+                .toString());
     }
 
     protected Request.Builder getRequestBuilder() {
-        Request.Builder builder = new Request.Builder();
+        return new Request.Builder();
+    }
+
+    private Request.Builder addRequestCredentials(Request request) {
+        Request.Builder builder =  request.newBuilder();
 
         for(Map.Entry<String, String> header
                 : mContext.getOCAccount()
@@ -55,7 +86,8 @@ public abstract class RemoteOperation {
                 .getOCAccount()
                 .getCredentials()
                 .getCredentialCookie();
-        if(credentialCookie == null) {
+        if(credentialCookie != null) {
+            System.err.println(credentialCookie);
             builder.addHeader("Cookie", credentialCookie);
         }
 
diff --git a/src/com/owncloud/android/lib/refactor/account/OCAccount.java b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
index ab9c2618..007722ec 100644
--- a/src/com/owncloud/android/lib/refactor/account/OCAccount.java
+++ b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
@@ -91,7 +91,11 @@ public class OCAccount {
         }
         mSavedAccount = null;
         mSavedAccountName = null;
-        mBaseUri = baseUri;
+        if(baseUri != null && !baseUri.equals("")) {
+            mBaseUri = baseUri;
+        } else {
+            throw new IllegalArgumentException("baseUri can not be null or empty");
+        }
         mCredentials = credentials != null
                 ? credentials
                 : new OCAnonymousCredentials();
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index 12de7e93..b245e2d1 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -5,12 +5,15 @@ import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 import java.io.IOException;
+import java.util.logging.Logger;
 
+import at.bitfire.dav4android.Constants;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.property.DisplayName;
 import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 
 public class PropfindOperation extends RemoteOperation {
 
@@ -24,23 +27,17 @@ public class PropfindOperation extends RemoteOperation {
 
     @Override
     public RemoteOperationResult exec() {
-        DavResource davResource = new DavResource(
-                getClient(),
-                HttpUrl.parse(getWebDAVUriBuilder() + WebdavUtils.encodePath(mRemotePath)),
-                null);
 
         try {
-            davResource.propfind(1, DisplayName.NAME);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (HttpException e) {
-            e.printStackTrace();
-        } catch (DavException e) {
+            HttpUrl location = HttpUrl.parse(getBaseUriBuilder().build().toString());
+
+            DavResource davResource = new DavResource(getClient(), getWebDavHttpUrl("/"));
+            davResource.propfind(0, DisplayName.NAME);
+
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
-        davResource.getProperties();
-
         return null;
     }
 }
\ No newline at end of file

From a4678557d86ef7131c65358e0c1a62838d3ae588 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 22 May 2018 12:16:20 +0200
Subject: [PATCH 008/133] Remove unneeded slahes in url

---
 .../lib/sampleclient/MainActivity.java        |  2 +-
 .../android/lib/refactor/RemoteOperation.java | 32 ++++++-------------
 .../operations/PropfindOperation.java         |  9 ------
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 81777161..85d2c099 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -158,8 +158,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     private void startRefresh() {
 
 		final PropfindOperation propfindOperation = new PropfindOperation(mOCContext, FileUtils.PATH_SEPARATOR);
+		new Thread(() -> propfindOperation.exec()).start();
 
-		Thread tread = new Thread(() -> propfindOperation.exec());
 //    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
 //    	refreshOperation.execute(mClient, this, mHandler);
     }
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index cb53b6e2..c212845e 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,19 +1,19 @@
 package com.owncloud.android.lib.refactor;
 
+import android.annotation.TargetApi;
 import android.net.Uri;
+import android.os.Build;
 
-import java.io.IOException;
 import java.util.Map;
 
+import at.bitfire.dav4android.UrlUtils;
 import okhttp3.HttpUrl;
-import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 public abstract class RemoteOperation {
     private final OCContext mContext;
-    private static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
+    private static final String WEBDAV_PATH_4_0 = "remote.php/dav";
     private static OkHttpClient mClient = null;
 
     protected RemoteOperation(OCContext context) {
@@ -46,24 +46,13 @@ public abstract class RemoteOperation {
         return mContext.getOCAccount().getBaseUri().buildUpon();
     }
 
-    protected Uri getWebDavUrl() {
-        return getBaseUriBuilder().appendEncodedPath(WEBDAV_PATH_4_0).build();
-    }
-
-    protected Uri getWebDavUri(String resourcePath) {
-        return getBaseUriBuilder()
-                .appendEncodedPath(WEBDAV_PATH_4_0)
-                .appendEncodedPath(resourcePath)
-                .build();
-    }
-
     protected HttpUrl getWebDavHttpUrl(String resourcePath) {
-        return HttpUrl.parse(
+        return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse(
                 getBaseUriBuilder()
-                .appendEncodedPath(WEBDAV_PATH_4_0)
-                .appendEncodedPath(resourcePath)
-                .build()
-                .toString());
+                        .appendEncodedPath(WEBDAV_PATH_4_0)
+                        .appendEncodedPath(resourcePath)
+                        .build()
+                        .toString()));
     }
 
     protected Request.Builder getRequestBuilder() {
@@ -73,8 +62,7 @@ public abstract class RemoteOperation {
     private Request.Builder addRequestCredentials(Request request) {
         Request.Builder builder =  request.newBuilder();
 
-        for(Map.Entry<String, String> header
-                : mContext.getOCAccount()
+        for(Map.Entry<String, String> header : mContext.getOCAccount()
                 .getCredentials()
                 .getCredentialHeaders()
                 .entrySet()) {
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index b245e2d1..6ee5bb9a 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -1,19 +1,11 @@
 package com.owncloud.android.lib.refactor.operations;
 
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
-import java.io.IOException;
-import java.util.logging.Logger;
 
-import at.bitfire.dav4android.Constants;
 import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.exception.DavException;
-import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.property.DisplayName;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 
 public class PropfindOperation extends RemoteOperation {
 
@@ -29,7 +21,6 @@ public class PropfindOperation extends RemoteOperation {
     public RemoteOperationResult exec() {
 
         try {
-            HttpUrl location = HttpUrl.parse(getBaseUriBuilder().build().toString());
 
             DavResource davResource = new DavResource(getClient(), getWebDavHttpUrl("/"));
             davResource.propfind(0, DisplayName.NAME);

From 7cb9189fce49c12fa96e8d20a2b0d9342f44e75b Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 22 May 2018 17:10:32 +0200
Subject: [PATCH 009/133] Keep completing the propfind

---
 dav4android                                                  | 2 +-
 src/com/owncloud/android/lib/refactor/RemoteOperation.java   | 3 ++-
 .../android/lib/refactor/operations/PropfindOperation.java   | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dav4android b/dav4android
index 9b39bb9d..9bc069f4 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 9b39bb9d05bf27510ceeee105fb6edc2068fe8e2
+Subproject commit 9bc069f4ed25590ba457c2f35067eb63604a0e9a
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index c212845e..d9cb412d 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -13,7 +13,7 @@ import okhttp3.Request;
 
 public abstract class RemoteOperation {
     private final OCContext mContext;
-    private static final String WEBDAV_PATH_4_0 = "remote.php/dav";
+    private static final String WEBDAV_PATH_4_0 = "remote.php/dav/files";
     private static OkHttpClient mClient = null;
 
     protected RemoteOperation(OCContext context) {
@@ -50,6 +50,7 @@ public abstract class RemoteOperation {
         return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse(
                 getBaseUriBuilder()
                         .appendEncodedPath(WEBDAV_PATH_4_0)
+                        .appendEncodedPath(mContext.getOCAccount().getDisplayName())
                         .appendEncodedPath(resourcePath)
                         .build()
                         .toString()));
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index 6ee5bb9a..07ccfc35 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -5,7 +5,7 @@ import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.RemoteOperationResult;
 
 import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.property.DisplayName;
+import at.bitfire.dav4android.PropertyUtils;
 
 public class PropfindOperation extends RemoteOperation {
 
@@ -21,9 +21,8 @@ public class PropfindOperation extends RemoteOperation {
     public RemoteOperationResult exec() {
 
         try {
-
             DavResource davResource = new DavResource(getClient(), getWebDavHttpUrl("/"));
-            davResource.propfind(0, DisplayName.NAME);
+            davResource.propfind(1, PropertyUtils.INSTANCE.getAllPropSet());
 
         } catch (Exception e) {
             e.printStackTrace();

From 68fae4624037863d07526577abbe2acf7936ade0 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 22 May 2018 17:59:14 +0200
Subject: [PATCH 010/133] Register new WebDAV properties in dav4android

---
 dav4android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dav4android b/dav4android
index 9bc069f4..9c17b13b 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 9bc069f4ed25590ba457c2f35067eb63604a0e9a
+Subproject commit 9c17b13bc01cf7433245951f1e044de53593b84f

From 77c7c5195b9c6127f26509aee8b1a2af9edd7ffa Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 23 May 2018 17:47:24 +0200
Subject: [PATCH 011/133] Create DAVOCResource and http constants file in
 dav4android

---
 dav4android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dav4android b/dav4android
index 9c17b13b..ffeb457c 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 9c17b13bc01cf7433245951f1e044de53593b84f
+Subproject commit ffeb457c4df4691aad75a43eaad54a6d8788ee75

From 2ba891df15b63b38b280d9cbba9ca5feac2f2d87 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 23 May 2018 18:06:43 +0200
Subject: [PATCH 012/133] Include user agent in OCContext and start
 implementing the generic put operation

---
 .../lib/sampleclient/MainActivity.java        |  2 +-
 .../android/lib/refactor/OCContext.java       | 13 +++---
 .../android/lib/refactor/RemoteOperation.java |  3 ++
 .../lib/refactor/operations/PutOperation.java | 44 +++++++++++++++++++
 4 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/refactor/operations/PutOperation.java

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 85d2c099..bf5e4d18 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -93,7 +93,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     					getString(R.string.username),
     					getString(R.string.password)));
 
-    	mOCContext = new OCContext(ocAccount);
+    	mOCContext = new OCContext(ocAccount, getString(R.string.user_agent));
     	
     	mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
     	((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
diff --git a/src/com/owncloud/android/lib/refactor/OCContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
index aebffa92..e91a4240 100644
--- a/src/com/owncloud/android/lib/refactor/OCContext.java
+++ b/src/com/owncloud/android/lib/refactor/OCContext.java
@@ -4,11 +4,6 @@ import com.owncloud.android.lib.refactor.account.OCAccount;
 
 public class OCContext {
     private static final String TAG = OCContext.class.toString();
-
-    public static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
-    public static final String STATUS_PATH = "/status.php";
-    public static final String FILES_WEB_PATH = "/index.php/apps/files";
-
     private static final int MAX_REDIRECTIONS_COUNT = 3;
     private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
     private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
@@ -16,12 +11,18 @@ public class OCContext {
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
 
     private OCAccount mOCAccount;
+    private String mUserAgent;
 
-    public OCContext(OCAccount account) {
+    public OCContext(OCAccount account, String userAgent) {
         mOCAccount = account;
+        mUserAgent = userAgent;
     }
 
     public OCAccount getOCAccount() {
         return mOCAccount;
     }
+
+    public String getUserAgent() {
+        return mUserAgent;
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index d9cb412d..a64ad37c 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -13,6 +13,8 @@ import okhttp3.Request;
 
 public abstract class RemoteOperation {
     private final OCContext mContext;
+    // TODO Move to a constants file
+    private static final String USER_AGENT_HEADER = "User-Agent";
     private static final String WEBDAV_PATH_4_0 = "remote.php/dav/files";
     private static OkHttpClient mClient = null;
 
@@ -37,6 +39,7 @@ public abstract class RemoteOperation {
                         chain.proceed(
                                 addRequestCredentials(
                                         chain.request())
+                                        .addHeader(USER_AGENT_HEADER, mContext.getUserAgent())
                                         .build()))
                 .followRedirects(false)
                 .build();
diff --git a/src/com/owncloud/android/lib/refactor/operations/PutOperation.java b/src/com/owncloud/android/lib/refactor/operations/PutOperation.java
new file mode 100644
index 00000000..76c453ff
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/operations/PutOperation.java
@@ -0,0 +1,44 @@
+package com.owncloud.android.lib.refactor.operations;
+
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.RemoteOperationResult;
+
+import at.bitfire.dav4android.DavOCResource;
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.PropertyUtils;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+public class PutOperation extends RemoteOperation {
+
+    private String mRemotePath;
+    private String mMimeType;
+    private String mTimeStamp;
+
+    public PutOperation(OCContext context, String remotePath, String mimetype, String timestamp) {
+        super(context);
+
+        mRemotePath = remotePath;
+        mMimeType = mimetype;
+        mTimeStamp = timestamp;
+    }
+
+    @Override
+    public RemoteOperationResult exec() {
+
+        try {
+
+            MediaType mediaType = MediaType.parse(mMimeType);
+            RequestBody requestBody = RequestBody.create(mediaType, mRemotePath);
+
+            DavOCResource davOCResource = new DavOCResource(getClient(), getWebDavHttpUrl(mRemotePath), null);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}
\ No newline at end of file

From 2ef51dd5f6a7279b4e14ee03aa06be34d70493ea Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 23 May 2018 18:14:46 +0200
Subject: [PATCH 013/133] Move webdav path constant and refactor some Remote
 operation methods

---
 .../android/lib/refactor/RemoteOperation.java        | 12 ++++++++++--
 .../android/lib/refactor/account/AccountUtils.java   |  3 ++-
 .../operations/OAuth2GetAccessTokenOperation.java    |  5 +----
 .../OAuth2RefreshAccessTokenOperation.java           |  5 +----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index a64ad37c..24caf1aa 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -15,7 +15,7 @@ public abstract class RemoteOperation {
     private final OCContext mContext;
     // TODO Move to a constants file
     private static final String USER_AGENT_HEADER = "User-Agent";
-    private static final String WEBDAV_PATH_4_0 = "remote.php/dav/files";
+    public static final String WEBDAV_PATH_4_0 = "remote.php/dav/files";
     private static OkHttpClient mClient = null;
 
     protected RemoteOperation(OCContext context) {
@@ -45,10 +45,18 @@ public abstract class RemoteOperation {
                 .build();
     }
 
-    protected Uri.Builder getBaseUriBuilder() {
+    private Uri.Builder getBaseUriBuilder() {
         return mContext.getOCAccount().getBaseUri().buildUpon();
     }
 
+    protected HttpUrl getHttpUrl(String endpointPath) {
+        return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse(
+                getBaseUriBuilder()
+                        .appendEncodedPath(endpointPath)
+                        .build()
+                        .toString()));
+    }
+
     protected HttpUrl getWebDavHttpUrl(String resourcePath) {
         return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse(
                 getBaseUriBuilder()
diff --git a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
index 26e2e21e..c1568c2e 100644
--- a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
+++ b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
@@ -35,6 +35,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBearerCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
@@ -65,7 +66,7 @@ public class AccountUtils {
     public static String getWebDavUrlForAccount(Context context, Account account)
         throws AccountNotFoundException {
 
-        return getBaseUrlForAccount(context, account) + OCContext.WEBDAV_PATH_4_0;
+        return getBaseUrlForAccount(context, account) + RemoteOperation.WEBDAV_PATH_4_0;
     }
 
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index 495315bd..4ada6507 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -91,10 +91,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
                     .build();
 
             final Request request = getRequestBuilder()
-                    .url(getBaseUriBuilder()
-                            .appendEncodedPath(mAccessTokenEndpointPath)
-                            .build()
-                            .toString())
+                    .url(getHttpUrl(mAccessTokenEndpointPath))
                     .method("POST", requestBody)
                     .build();
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index 78e67e47..98929f4a 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -86,10 +86,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
                     .build();
 
             final Request request = getRequestBuilder()
-                    .url(getBaseUriBuilder()
-                            .appendEncodedPath(mAccessTokenEndpointPath)
-                            .build()
-                            .toString())
+                    .url(getHttpUrl(mAccessTokenEndpointPath))
                     .method("POST", requestBody)
                     .build();
 

From 75ce8e186fb6fae9286a758cc02929f64fd207e3 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 23 May 2018 19:06:45 +0200
Subject: [PATCH 014/133] Implement UploadRemoteFileOperation with dav4droid

---
 dav4android                                   |  2 +-
 .../lib/sampleclient/MainActivity.java        | 75 +++++++++--------
 .../operations/PropfindOperation.java         | 25 +++++-
 .../lib/refactor/operations/PutOperation.java | 44 ----------
 .../operations/UploadRemoteFileOperation.java | 81 +++++++++++++++++++
 5 files changed, 149 insertions(+), 78 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/PutOperation.java
 create mode 100644 src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java

diff --git a/dav4android b/dav4android
index ffeb457c..6a5835a9 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit ffeb457c4df4691aad75a43eaad54a6d8788ee75
+Subproject commit 6a5835a960c4a3d4361a70ef72914b9fa214363d
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index bf5e4d18..1cb4eb5b 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -24,32 +24,6 @@
 
 package com.owncloud.android.lib.sampleclient;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.account.OCAccount;
-import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.refactor.OwnCloudContext;
-import com.owncloud.android.lib.refactor.operations.PropfindOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
-import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.FileUtils;
-
 import android.app.Activity;
 import android.content.res.AssetManager;
 import android.graphics.drawable.BitmapDrawable;
@@ -62,6 +36,31 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.account.OCAccount;
+import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.refactor.operations.PropfindOperation;
+import com.owncloud.android.lib.refactor.operations.UploadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
 	private static String LOG_TAG = MainActivity.class.getCanonicalName();
@@ -165,6 +164,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     }
     
     private void startUpload() {
+
+
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
     	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
@@ -174,9 +175,19 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		Long timeStampLong = fileToUpload.lastModified()/1000;
 		String timeStamp = timeStampLong.toString();
 
-    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
-    	uploadOperation.addDatatransferProgressListener(this);
-    	uploadOperation.execute(mClient, this, mHandler);
+		final UploadRemoteFileOperation uploadRemoteFileOperation = new UploadRemoteFileOperation(
+				mOCContext,
+				fileToUpload.getAbsolutePath(),
+				remotePath,
+				mimeType,
+				timeStamp
+		);
+
+		new Thread(() -> uploadRemoteFileOperation.exec()).start();
+
+//    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
+//    	uploadOperation.addDatatransferProgressListener(this);
+//    	uploadOperation.execute(mClient, this, mHandler);
     }
 
     private void startRemoteDeletion() {
@@ -219,8 +230,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		} else if (operation instanceof ReadRemoteFolderOperation) {
 			onSuccessfulRefresh((ReadRemoteFolderOperation)operation, result);
 			
-		} else if (operation instanceof UploadRemoteFileOperation ) {
-			onSuccessfulUpload((UploadRemoteFileOperation)operation, result);
+		} else if (operation instanceof com.owncloud.android.lib.resources.files.UploadRemoteFileOperation) {
+			onSuccessfulUpload((com.owncloud.android.lib.resources.files.UploadRemoteFileOperation)operation, result);
 			
 		} else if (operation instanceof RemoveRemoteFileOperation ) {
 			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);
@@ -249,7 +260,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		mFilesAdapter.notifyDataSetChanged();
 	}
 
-	private void onSuccessfulUpload(UploadRemoteFileOperation operation, RemoteOperationResult result) {
+	private void onSuccessfulUpload(com.owncloud.android.lib.resources.files.UploadRemoteFileOperation operation, RemoteOperationResult result) {
 		startRefresh();
 	}
 
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index 07ccfc35..2b4d074b 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.refactor.operations;
 
 import com.owncloud.android.lib.refactor.OCContext;
@@ -13,7 +37,6 @@ public class PropfindOperation extends RemoteOperation {
 
     public PropfindOperation(OCContext context, String remotePath) {
         super(context);
-
         mRemotePath = remotePath;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/operations/PutOperation.java b/src/com/owncloud/android/lib/refactor/operations/PutOperation.java
deleted file mode 100644
index 76c453ff..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/PutOperation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.owncloud.android.lib.refactor.operations;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
-
-import at.bitfire.dav4android.DavOCResource;
-import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.PropertyUtils;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-
-public class PutOperation extends RemoteOperation {
-
-    private String mRemotePath;
-    private String mMimeType;
-    private String mTimeStamp;
-
-    public PutOperation(OCContext context, String remotePath, String mimetype, String timestamp) {
-        super(context);
-
-        mRemotePath = remotePath;
-        mMimeType = mimetype;
-        mTimeStamp = timestamp;
-    }
-
-    @Override
-    public RemoteOperationResult exec() {
-
-        try {
-
-            MediaType mediaType = MediaType.parse(mMimeType);
-            RequestBody requestBody = RequestBody.create(mediaType, mRemotePath);
-
-            DavOCResource davOCResource = new DavOCResource(getClient(), getWebDavHttpUrl(mRemotePath), null);
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
new file mode 100644
index 00000000..84bdac14
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
@@ -0,0 +1,81 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.operations;
+
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.RemoteOperationResult;
+
+import java.io.File;
+
+import at.bitfire.dav4android.DavOCResource;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+public class UploadRemoteFileOperation extends RemoteOperation {
+
+    private String mLocalPath;
+    private String mRemotePath;
+    private String mMimeType;
+    private String mFileLastModifTimestamp;
+
+    public UploadRemoteFileOperation(OCContext context, String localPath, String remotePath, String mimetype,
+                                     String fileLastModifTimestamp) {
+        super(context);
+
+        mLocalPath = localPath;
+        mRemotePath = remotePath;
+        mMimeType = mimetype;
+        mFileLastModifTimestamp = fileLastModifTimestamp;
+    }
+
+    @Override
+    public RemoteOperationResult exec() {
+
+        try {
+
+            File fileToUpload = new File(mLocalPath);
+            MediaType mediaType = MediaType.parse(mMimeType);
+            RequestBody requestBody = RequestBody.create(mediaType, fileToUpload);
+
+            DavOCResource davOCResource = new DavOCResource(
+                    getClient(),
+                    getWebDavHttpUrl(mRemotePath),
+                    null);
+
+            davOCResource.put(requestBody,
+                    null,
+                    false,
+                    "multipart/form-data",
+                    String.valueOf(fileToUpload.length()),
+                    mFileLastModifTimestamp);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}
\ No newline at end of file

From 63c917c979a698ce3b33ece19816cd827c64532a Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 24 May 2018 11:28:04 +0200
Subject: [PATCH 015/133] Include upload headers in interceptor and finish
 upload file operation

---
 dav4android                                   |  2 +-
 .../android/lib/refactor/RemoteOperation.java |  7 ++-
 .../operations/UploadRemoteFileOperation.java | 59 ++++++++++++++-----
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/dav4android b/dav4android
index 6a5835a9..d0a09ad1 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 6a5835a960c4a3d4361a70ef72914b9fa214363d
+Subproject commit d0a09ad1ea87044d7e50cc870fc798562d1f0d38
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 24caf1aa..1af1434f 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -37,10 +37,11 @@ public abstract class RemoteOperation {
         return mClient.newBuilder()
                 .addInterceptor(chain ->
                         chain.proceed(
-                                addRequestCredentials(
-                                        chain.request())
+                                addRequestCredentials(chain.request())
                                         .addHeader(USER_AGENT_HEADER, mContext.getUserAgent())
-                                        .build()))
+                                        .build()
+                        )
+                )
                 .followRedirects(false)
                 .build();
     }
diff --git a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
index 84bdac14..d0ca312f 100644
--- a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
@@ -30,23 +30,33 @@ import com.owncloud.android.lib.refactor.RemoteOperationResult;
 
 import java.io.File;
 
-import at.bitfire.dav4android.DavOCResource;
+import at.bitfire.dav4android.DavResource;
 import okhttp3.MediaType;
+import okhttp3.Request;
 import okhttp3.RequestBody;
 
+/**
+ * @author David González Verdugo
+ */
 public class UploadRemoteFileOperation extends RemoteOperation {
 
-    private String mLocalPath;
+    private static final String CONTENT_TYPE_HEADER = "Content-Type";
+    private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
+    private static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
+    private static final String IF_MATCH_HEADER = "If-Match";
+
+    private File mFileToUpload;
     private String mRemotePath;
     private String mMimeType;
     private String mFileLastModifTimestamp;
 
+
     public UploadRemoteFileOperation(OCContext context, String localPath, String remotePath, String mimetype,
                                      String fileLastModifTimestamp) {
         super(context);
 
-        mLocalPath = localPath;
-        mRemotePath = remotePath;
+        mFileToUpload = new File(localPath);
+        mRemotePath = remotePath.replaceAll("^/+", ""); //Delete leading slashes
         mMimeType = mimetype;
         mFileLastModifTimestamp = fileLastModifTimestamp;
     }
@@ -56,21 +66,25 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
         try {
 
-            File fileToUpload = new File(mLocalPath);
             MediaType mediaType = MediaType.parse(mMimeType);
-            RequestBody requestBody = RequestBody.create(mediaType, fileToUpload);
+            RequestBody requestBody = RequestBody.create(mediaType, mFileToUpload);
 
-            DavOCResource davOCResource = new DavOCResource(
-                    getClient(),
-                    getWebDavHttpUrl(mRemotePath),
-                    null);
+            DavResource davResource = new DavResource(
+                    getClient()
+                            .newBuilder()
+                            .addInterceptor(chain ->
+                                    chain.proceed(
+                                            addUploadHeaders(chain.request())
+                                            .build()
+                                    )
+                            )
+                            .followRedirects(false)
+                            .build(),
+                    getWebDavHttpUrl(mRemotePath));
 
-            davOCResource.put(requestBody,
+            davResource.put(requestBody,
                     null,
-                    false,
-                    "multipart/form-data",
-                    String.valueOf(fileToUpload.length()),
-                    mFileLastModifTimestamp);
+                    false);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -78,4 +92,19 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
         return null;
     }
+
+    /**
+     * Add headers needed to upload a file
+     * @param request request in which include the headers
+     * @return request with upload headers
+     */
+    private Request.Builder addUploadHeaders (Request request) {
+
+        Request.Builder builder =  request.newBuilder();
+        builder.addHeader(CONTENT_TYPE_HEADER, "multipart/form-data");
+        builder.addHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(mFileToUpload.length()));
+        builder.addHeader(OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+
+        return builder;
+    }
 }
\ No newline at end of file

From dae28aee489e8170bd9197375eb9b8161a14aa08 Mon Sep 17 00:00:00 2001
From: DerSchabi <chris.schabesberger@mailbox.org>
Date: Thu, 24 May 2018 12:46:55 +0200
Subject: [PATCH 016/133] refactor RemoteOperationResult

---
 dav4android                                   |   2 +-
 sample_client/res/values/setup.xml            |   2 +-
 .../lib/sampleclient/MainActivity.java        |  70 ++++---
 .../android/lib/refactor/RemoteOperation.java |  42 +++-
 .../lib/refactor/RemoteOperationResult.java   | 193 ++++++++----------
 .../oauth/OwnCloudOAuth2RequestBuilder.java   |   2 -
 .../OAuth2GetAccessTokenOperation.java        |  30 +--
 .../OAuth2RefreshAccessTokenOperation.java    |  39 ++--
 .../operations/PropfindOperation.java         |  20 +-
 .../operations/UploadRemoteFileOperation.java |  14 +-
 .../lib/resources/files/RemoteFile.java       |  39 ++++
 11 files changed, 244 insertions(+), 209 deletions(-)

diff --git a/dav4android b/dav4android
index d0a09ad1..980eb7ec 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit d0a09ad1ea87044d7e50cc870fc798562d1f0d38
+Subproject commit 980eb7ece17314f6c88f87319be1541c579c4b94
diff --git a/sample_client/res/values/setup.xml b/sample_client/res/values/setup.xml
index 02fdda52..28c2baad 100644
--- a/sample_client/res/values/setup.xml
+++ b/sample_client/res/values/setup.xml
@@ -24,7 +24,7 @@
  -->
  
 <resources>
-    <string name="server_base_url">http://docker.oc.solidgear.es:11917/</string>
+    <string name="server_base_url">http://docker.oc.solidgear.es:11917</string>
     <string name="username">admin</string>
     <string name="password">Password</string>
     <string name ="user_agent">Mozilla/5.0 (Android) ownCloud sample </string>
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 1cb4eb5b..870fc33d 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -24,6 +24,31 @@
 
 package com.owncloud.android.lib.sampleclient;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.account.OCAccount;
+import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.refactor.operations.PropfindOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.UploadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.FileUtils;
+
 import android.app.Activity;
 import android.content.res.AssetManager;
 import android.graphics.drawable.BitmapDrawable;
@@ -36,43 +61,16 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.account.OCAccount;
-import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.refactor.operations.PropfindOperation;
-import com.owncloud.android.lib.refactor.operations.UploadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import at.bitfire.dav4android.DavResource;
 
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
 	private static String LOG_TAG = MainActivity.class.getCanonicalName();
 	
 	private Handler mHandler;
-	
 	private OwnCloudClient mClient;
-
 	private OCContext mOCContext;
-	
 	private FilesArrayAdapter mFilesAdapter;
-	
 	private View mFrame;
 	
     /** Called when the activity is first created. */
@@ -157,8 +155,20 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     private void startRefresh() {
 
 		final PropfindOperation propfindOperation = new PropfindOperation(mOCContext, FileUtils.PATH_SEPARATOR);
-		new Thread(() -> propfindOperation.exec()).start();
-
+		final Handler handler = new Handler();
+		new Thread(() -> {
+			final PropfindOperation.Result result = propfindOperation.exec();
+			final List<RemoteFile> remoteFiles = new ArrayList<>();
+			if(!result.isSuccess()) {
+				handler.post(() ->
+						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
+				return;
+			}
+			for(DavResource el : result.getData().getMembers()) {
+				remoteFiles.add(new RemoteFile(el));
+			}
+			handler.post(() -> mFilesAdapter.addAll(remoteFiles));
+		}).start();
 //    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
 //    	refreshOperation.execute(mClient, this, mHandler);
     }
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
index 1af1434f..862ca8d3 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java
@@ -1,23 +1,55 @@
 package com.owncloud.android.lib.refactor;
-
-import android.annotation.TargetApi;
 import android.net.Uri;
-import android.os.Build;
 
+import java.io.IOException;
 import java.util.Map;
 
 import at.bitfire.dav4android.UrlUtils;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Response;
 
-public abstract class RemoteOperation {
+public abstract class RemoteOperation<I extends Object> {
     private final OCContext mContext;
     // TODO Move to a constants file
     private static final String USER_AGENT_HEADER = "User-Agent";
     public static final String WEBDAV_PATH_4_0 = "remote.php/dav/files";
     private static OkHttpClient mClient = null;
 
+
+    public class Result extends RemoteOperationResult {
+        public Result(ResultCode code) {
+            this(code, null);
+        }
+
+        public Result(ResultCode code, I data) {
+            super(code);
+            mData = data;
+        }
+
+        public Result(Exception e) {
+            super(e);
+            mData = null;
+        }
+
+        public Result(boolean success, Request request, Response response) throws IOException {
+            this(success, request, response, null);;
+        }
+
+        public Result(boolean success, Request request, Response response, I data) throws IOException {
+            super(success, request, response);
+            mData = data;
+        }
+
+        private final I mData;
+
+        public I getData() {
+            return mData;
+        }
+    }
+
+
     protected RemoteOperation(OCContext context) {
         mContext = context;
         if(mClient == null) {
@@ -27,7 +59,7 @@ public abstract class RemoteOperation {
         }
     }
 
-    public abstract RemoteOperationResult exec();
+    public abstract Result exec();
 
     protected OCContext getOCContext() {
         return mContext;
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java b/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
index eb89e0a3..deef482c 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
@@ -37,7 +37,6 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.json.JSONException;
 
 import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
@@ -51,8 +50,16 @@ import java.util.Map;
 
 import javax.net.ssl.SSLException;
 
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.exception.ConflictException;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.exception.InvalidDavResponseException;
+import at.bitfire.dav4android.exception.NotFoundException;
+import at.bitfire.dav4android.exception.PreconditionFailedException;
+import at.bitfire.dav4android.exception.ServiceUnavailableException;
+import at.bitfire.dav4android.exception.UnauthorizedException;
+import at.bitfire.dav4android.exception.UnsupportedDavException;
 import okhttp3.Headers;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -66,7 +73,7 @@ import okhttp3.Response;
  *
  * @author David A. Velasco
  */
-public class RemoteOperationResult implements Serializable {
+public abstract class RemoteOperationResult implements Serializable {
 
     /**
      * Generated - should be refreshed every time the class changes!!
@@ -75,6 +82,7 @@ public class RemoteOperationResult implements Serializable {
 
     private static final String TAG = RemoteOperationResult.class.getSimpleName();
 
+
     public enum ResultCode {
         OK,
         OK_SSL,
@@ -137,8 +145,6 @@ public class RemoteOperationResult implements Serializable {
     private ArrayList<String> mAuthenticate = new ArrayList<>();
     private String mLastPermanentLocation = null;
 
-    private ArrayList<Object> mData;
-
     /**
      * Public constructor from result code.
      *
@@ -151,7 +157,6 @@ public class RemoteOperationResult implements Serializable {
         mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL ||
                 code == ResultCode.OK_NO_SSL ||
                 code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION);
-        mData = null;
     }
 
     /**
@@ -164,53 +169,39 @@ public class RemoteOperationResult implements Serializable {
      * @param e Exception that interrupted the {@link RemoteOperation}
      */
     public RemoteOperationResult(Exception e) {
-        mException = e;
-
-        if (e instanceof OperationCancelledException) {
-            mCode = ResultCode.CANCELLED;
-
-        } else if (e instanceof SocketException) {
-            mCode = ResultCode.WRONG_CONNECTION;
-
-        } else if (e instanceof SocketTimeoutException) {
-            mCode = ResultCode.TIMEOUT;
-
-        } else if (e instanceof SocketTimeoutException) {
-            mCode = ResultCode.TIMEOUT;
-
-        } else if (e instanceof MalformedURLException) {
-            mCode = ResultCode.INCORRECT_ADDRESS;
-
-        } else if (e instanceof UnknownHostException) {
-            mCode = ResultCode.HOST_NOT_AVAILABLE;
-
-        } else if (e instanceof AccountNotFoundException) {
-            mCode = ResultCode.ACCOUNT_NOT_FOUND;
-
-        } else if (e instanceof AccountsException) {
-            mCode = ResultCode.ACCOUNT_EXCEPTION;
-
-        } else if (e instanceof SSLException || e instanceof RuntimeException) {
+        if (e instanceof SSLException || e instanceof RuntimeException) {
             CertificateCombinedException se = getCertificateCombinedException(e);
-            if (se != null) {
-                mException = se;
-                if (se.isRecoverable()) {
-                    mCode = ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
-                }
-            } else if (e instanceof RuntimeException) {
-                mCode = ResultCode.HOST_NOT_AVAILABLE;
-
-            } else {
-                mCode = ResultCode.SSL_ERROR;
-            }
-
-        } else if (e instanceof FileNotFoundException) {
-            mCode = ResultCode.LOCAL_FILE_NOT_FOUND;
-
+            mException = se;
         } else {
-            mCode = ResultCode.UNKNOWN_ERROR;
+            mException = e;
         }
 
+        mCode = getResultCodeByException(e);
+    }
+
+    private ResultCode getResultCodeByException(Exception e) {
+        return (e instanceof UnauthorizedException) ? ResultCode.UNAUTHORIZED
+                : (e instanceof NotFoundException) ? ResultCode.FILE_NOT_FOUND
+                : (e instanceof ConflictException) ? ResultCode.CONFLICT
+                : (e instanceof PreconditionFailedException) ? ResultCode.UNKNOWN_ERROR
+                : (e instanceof ServiceUnavailableException) ? ResultCode.SERVICE_UNAVAILABLE
+                : (e instanceof HttpException) ? ResultCode.UNHANDLED_HTTP_CODE
+                : (e instanceof InvalidDavResponseException) ? ResultCode.UNKNOWN_ERROR
+                : (e instanceof UnsupportedDavException) ? ResultCode.UNKNOWN_ERROR
+                : (e instanceof DavException) ? ResultCode.UNKNOWN_ERROR
+                : (e instanceof SSLException || e instanceof RuntimeException) ? handleSSLException(e)
+                : (e instanceof SocketException) ? ResultCode.WRONG_CONNECTION
+                : (e instanceof SocketTimeoutException) ? ResultCode.TIMEOUT
+                : (e instanceof MalformedURLException) ? ResultCode.INCORRECT_ADDRESS
+                : (e instanceof UnknownHostException) ? ResultCode.HOST_NOT_AVAILABLE
+                : ResultCode.UNKNOWN_ERROR;
+    }
+
+    private ResultCode handleSSLException(Exception e) {
+        final CertificateCombinedException se = getCertificateCombinedException(e);
+        return (se != null && se.isRecoverable()) ? ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED
+                : (e instanceof RuntimeException) ? ResultCode.HOST_NOT_AVAILABLE
+                : ResultCode.SSL_ERROR;
     }
 
     /**
@@ -366,14 +357,6 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
-    public void setData(ArrayList<Object> files) {
-        mData = files;
-    }
-
-    public ArrayList<Object> getData() {
-        return mData;
-    }
-
     public boolean isSuccess() {
         return mSuccess;
     }
@@ -418,63 +401,57 @@ public class RemoteOperationResult implements Serializable {
             previousCause = cause;
             cause = cause.getCause();
         }
-        if (cause != null && cause instanceof CertificateCombinedException) {
-            result = (CertificateCombinedException) cause;
-        }
-        return result;
+        return (cause != null && cause instanceof CertificateCombinedException)
+                ? (CertificateCombinedException) cause
+                : result;
     }
 
     public String getLogMessage() {
 
         if (mException != null) {
-            if(mException instanceof OperationCancelledException)
-                return "Operation cancelled by the caller";
-            if(mException instanceof SocketException) return "Socket exception";
-            if(mException instanceof SocketTimeoutException) return "Socket timeout exception";
-            if(mException instanceof MalformedURLException) return "Malformed URL exception";
-            if(mException instanceof UnknownHostException) return "Unknown host exception";
-            if(mException instanceof CertificateCombinedException) {
-                if (((CertificateCombinedException) mException).isRecoverable())
-                    return "SSL recoverable exception";
-                else
-                    return "SSL exception";
-
-            }
-            if(mException instanceof SSLException) return "SSL exception";
-            if(mException instanceof DavException) return "Unexpected WebDAV exception";
-            if(mException instanceof HttpException) return "HTTP violation";
-            if(mException instanceof IOException) return "Unrecovered transport exception";
-            if(mException instanceof AccountNotFoundException) {
-                Account failedAccount =
-                        ((AccountNotFoundException) mException).getFailedAccount();
-                return mException.getMessage() + " (" +
-                        (failedAccount != null ? failedAccount.name : "NULL") + ")";
-
-            }
-            if (mException instanceof AccountsException) return "Exception while using account";
-            if (mException instanceof JSONException) return "JSON exception";
-
-            return "Unexpected exception";
+            return (mException instanceof OperationCancelledException)
+                    ? "Operation cancelled by the caller"
+                    : (mException instanceof SocketException) ? "Socket exception"
+                    : (mException instanceof SocketTimeoutException) ? "Socket timeout exception"
+                    : (mException instanceof MalformedURLException) ? "Malformed URL exception"
+                    : (mException instanceof UnknownHostException) ? "Unknown host exception"
+                    : (mException instanceof CertificateCombinedException) ?
+                        (((CertificateCombinedException) mException).isRecoverable()
+                                ? "SSL recoverable exception"
+                                : "SSL exception")
+                    : (mException instanceof SSLException) ? "SSL exception"
+                    : (mException instanceof DavException) ? "Unexpected WebDAV exception"
+                    : (mException instanceof HttpException) ? "HTTP violation"
+                    : (mException instanceof IOException) ? "Unrecovered transport exception"
+                    : (mException instanceof AccountNotFoundException)
+                        ? handleFailedAccountException((AccountNotFoundException)mException)
+                    : (mException instanceof AccountsException) ? "Exception while using account"
+                    : (mException instanceof JSONException) ? "JSON exception"
+                    : "Unexpected exception";
         }
 
-        if(mCode == ResultCode.INSTANCE_NOT_CONFIGURED)
-            return "The ownCloud server is not configured!";
-        if(mCode == ResultCode.NO_NETWORK_CONNECTION) return "No network connection";
-        if(mCode == ResultCode.BAD_OC_VERSION)
-            return "No valid ownCloud version was found at the server";
-        if(mCode == ResultCode.LOCAL_STORAGE_FULL) return "Local storage full";
-        if(mCode == ResultCode.LOCAL_STORAGE_NOT_MOVED)
-            return "Error while moving file to final directory";
-        if(mCode == ResultCode.ACCOUNT_NOT_NEW)
-            return "Account already existing when creating a new one";
-        if(mCode == ResultCode.INVALID_CHARACTER_IN_NAME)
-            return "The file name contains an forbidden character";
-        if(mCode == ResultCode.FILE_NOT_FOUND) return "Local file does not exist";
-        if(mCode == ResultCode.SYNC_CONFLICT) return "Synchronization conflict";
-
-        return "Operation finished with HTTP status code " + mHttpCode + " (" +
-                (isSuccess() ? "success" : "fail") + ")";
+        switch (mCode) {
+            case INSTANCE_NOT_CONFIGURED: return "The ownCloud server is not configured!";
+            case NO_NETWORK_CONNECTION: return "No network connection";
+            case BAD_OC_VERSION: return "No valid ownCloud version was found at the server";
+            case LOCAL_STORAGE_FULL: return "Local storage full";
+            case LOCAL_STORAGE_NOT_MOVED: return "Error while moving file to final directory";
+            case ACCOUNT_NOT_NEW: return "Account already existing when creating a new one";
+            case INVALID_CHARACTER_IN_NAME: return "The file name contains an forbidden character";
+            case FILE_NOT_FOUND: return "Local file does not exist";
+            case SYNC_CONFLICT: return "Synchronization conflict";
+            default: return "Operation finished with HTTP status code "
+                    + mHttpCode
+                    + " ("
+                    + (isSuccess() ? "success" : "fail")
+                    + ")";
+        }
+    }
 
+    private String handleFailedAccountException(AccountNotFoundException e) {
+        final Account failedAccount = e.getFailedAccount();
+        return e.getMessage() + " (" +
+                (failedAccount != null ? failedAccount.name : "NULL") + ")";
     }
 
     public boolean isServerFail() {
@@ -499,11 +476,11 @@ public class RemoteOperationResult implements Serializable {
                         mRedirectedLocation.toLowerCase().contains("wayf")));
     }
 
-    /**
+    /** TODO: make this set via constructor
      * Checks if is a non https connection
      *
      * @return boolean true/false
-     */
+
     public boolean isNonSecureRedirection() {
         return (mRedirectedLocation != null && !(mRedirectedLocation.toLowerCase().startsWith("https://")));
     }
@@ -519,5 +496,5 @@ public class RemoteOperationResult implements Serializable {
     public void setLastPermanentLocation(String lastPermanentLocation) {
         mLastPermanentLocation = lastPermanentLocation;
     }
-
+    */
 }
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
index ec9c3a41..e646a7d6 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
@@ -89,7 +89,6 @@ public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
                         mGrantType.getValue(),
                         mCode,
                         clientConfiguration.getClientId(),
-                        clientConfiguration.getClientSecret(),
                         clientConfiguration.getRedirectUri(),
                         mOAuth2Provider.getAccessTokenEndpointPath());
 
@@ -97,7 +96,6 @@ public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
                 return new OAuth2RefreshAccessTokenOperation(
                         ocContext,
                         clientConfiguration.getClientId(),
-                        clientConfiguration.getClientSecret(),
                         mRefreshToken,
                         mOAuth2Provider.getAccessTokenEndpointPath());
             default:
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index 4ada6507..f137e70b 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -46,12 +46,11 @@ import okhttp3.RequestBody;
 import okhttp3.Response;
 
 
-public class OAuth2GetAccessTokenOperation extends RemoteOperation {
+public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, String>> {
     
     private final String mGrantType;
     private final String mCode;
     private final String mClientId;
-    private final String mClientSecret;
     private final String mRedirectUri;
     private final String mAccessTokenEndpointPath;
     private final OAuth2ResponseParser mResponseParser;
@@ -61,12 +60,10 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
             String grantType,
             String code,
             String clientId,
-            String secretId,
             String redirectUri,
             String accessTokenEndpointPath) {
         super(context);
         mClientId = clientId;
-        mClientSecret = secretId;
         mRedirectUri = redirectUri;
         mGrantType = grantType;
         mCode = code;
@@ -80,7 +77,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
     }
 
     @Override
-    public RemoteOperationResult exec() {
+    public Result exec() {
         try {
             final RequestBody requestBody = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM)
@@ -102,27 +99,20 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
             final String responseData = response.body().string();
             
             if (responseData != null && responseData.length() > 0) {
-                JSONObject tokenJson = new JSONObject(responseData);
-                Map<String, String> accessTokenResult =
+                final JSONObject tokenJson = new JSONObject(responseData);
+                final Map<String, String> accessTokenResult =
                     mResponseParser.parseAccessTokenResult(tokenJson);
-                if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
-                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
-                    return new RemoteOperationResult(RemoteOperationResult.ResultCode.OAUTH2_ERROR);
-
-                } else {
-                    final RemoteOperationResult result = new RemoteOperationResult(true, request, response);
-                    ArrayList<Object> data = new ArrayList<>();
-                    data.add(accessTokenResult);
-                    result.setData(data);
-                    return result;
-                }
 
+                return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
+                        ? new Result(RemoteOperationResult.ResultCode.OAUTH2_ERROR)
+                        : new Result(true, request, response, accessTokenResult);
             } else {
-                return new RemoteOperationResult(false, request, response);
+                return new Result(false, request, response);
             }
 
         } catch (Exception e) {
-            return new RemoteOperationResult(e);
+            return new Result(e);
         }
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index 98929f4a..5594ff6b 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -40,42 +40,36 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
-public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
+public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<String, String>> {
 
     private static final String TAG = OAuth2RefreshAccessTokenOperation.class.getSimpleName();
 
-    private String mClientId;
-    private String mClientSecret;
-    private String mRefreshToken;
-
+    private final String mClientId;
+    private final String mRefreshToken;
     private final String mAccessTokenEndpointPath;
-
     private final OAuth2ResponseParser mResponseParser;
 
     public OAuth2RefreshAccessTokenOperation(
             OCContext ocContext,
             String clientId,
-            String secretId,
             String refreshToken,
             String accessTokenEndpointPath
     ) {
         super(ocContext);
 
         mClientId = clientId;
-        mClientSecret = secretId;
         mRefreshToken = refreshToken;
 
         mAccessTokenEndpointPath =
                 accessTokenEndpointPath != null ?
                         accessTokenEndpointPath :
-                        OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH
-        ;
+                        OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH;
 
         mResponseParser = new OAuth2ResponseParser();
     }
 
     @Override
-    public RemoteOperationResult exec() {
+    public Result exec() {
         try {
             final RequestBody requestBody = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM)
@@ -96,27 +90,20 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
             Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + responseData);
 
             if (responseData != null && responseData.length() > 0) {
-                JSONObject tokenJson = new JSONObject(responseData);
-                Map<String, String> accessTokenResult =
+                final JSONObject tokenJson = new JSONObject(responseData);
+                final Map<String, String> accessTokenResult =
                     mResponseParser.parseAccessTokenResult(tokenJson);
-                if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
-                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
-                    return new RemoteOperationResult(RemoteOperationResult.ResultCode.OAUTH2_ERROR);
-
-                } else {
-                    final RemoteOperationResult result = new RemoteOperationResult(true, request, response);
-                    ArrayList<Object> data = new ArrayList<>();
-                    data.add(accessTokenResult);
-                    result.setData(data);
-                    return result;
-                }
+                return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
+                    ? new Result(RemoteOperationResult.ResultCode.OAUTH2_ERROR)
+                    : new Result(true, request, response, accessTokenResult);
 
             } else {
-                return new RemoteOperationResult(false, request, response);
+                return new Result(false, request, response);
             }
 
         } catch (Exception e) {
-            return new RemoteOperationResult(e);
+            return new Result(e);
         }
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index 2b4d074b..367860b6 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -26,12 +26,14 @@ package com.owncloud.android.lib.refactor.operations;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
 
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
+import okhttp3.HttpUrl;
 
-public class PropfindOperation extends RemoteOperation {
+import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
+
+public class PropfindOperation extends RemoteOperation<DavResource> {
 
     private String mRemotePath;
 
@@ -41,16 +43,16 @@ public class PropfindOperation extends RemoteOperation {
     }
 
     @Override
-    public RemoteOperationResult exec() {
-
+    public Result exec() {
         try {
-            DavResource davResource = new DavResource(getClient(), getWebDavHttpUrl("/"));
+            final HttpUrl location = HttpUrl.parse(getWebDavHttpUrl("/").toString());
+
+            DavResource davResource = new DavResource(getClient(), location);
             davResource.propfind(1, PropertyUtils.INSTANCE.getAllPropSet());
 
+            return new Result(OK, davResource);
         } catch (Exception e) {
-            e.printStackTrace();
+            return new Result(e);
         }
-
-        return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
index d0ca312f..15d4407e 100644
--- a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
@@ -35,10 +35,12 @@ import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
+import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
+
 /**
  * @author David González Verdugo
  */
-public class UploadRemoteFileOperation extends RemoteOperation {
+public class UploadRemoteFileOperation extends RemoteOperation<Void> {
 
     private static final String CONTENT_TYPE_HEADER = "Content-Type";
     private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
@@ -62,7 +64,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     }
 
     @Override
-    public RemoteOperationResult exec() {
+    public Result exec() {
 
         try {
 
@@ -75,9 +77,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
                             .addInterceptor(chain ->
                                     chain.proceed(
                                             addUploadHeaders(chain.request())
-                                            .build()
-                                    )
-                            )
+                                            .build()))
                             .followRedirects(false)
                             .build(),
                     getWebDavHttpUrl(mRemotePath));
@@ -87,10 +87,10 @@ public class UploadRemoteFileOperation extends RemoteOperation {
                     false);
 
         } catch (Exception e) {
-            e.printStackTrace();
+            return new Result(e);
         }
 
-        return null;
+        return new Result(OK);
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index f2dc7330..f2e85871 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -27,11 +27,25 @@ package com.owncloud.android.lib.resources.files;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.owncloud.android.lib.common.network.WebdavEntry;
 
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.PropertyCollection;
+import at.bitfire.dav4android.property.CreationDate;
+import at.bitfire.dav4android.property.GetContentType;
+import at.bitfire.dav4android.property.GetETag;
+import at.bitfire.dav4android.property.GetLastModified;
+import at.bitfire.dav4android.property.QuotaAvailableBytes;
+import at.bitfire.dav4android.property.QuotaUsedBytes;
+import at.bitfire.dav4android.property.owncloud.OCId;
+import at.bitfire.dav4android.property.owncloud.OCPermissions;
+import at.bitfire.dav4android.property.owncloud.OCPrivatelink;
+import at.bitfire.dav4android.property.owncloud.OCSize;
+
 /**
  * Contains the data of a Remote File from a WebDavEntry
  *
@@ -184,6 +198,31 @@ public class RemoteFile implements Parcelable, Serializable {
         this.setPrivateLink(webdavEntry.privateLink());
     }
 
+    public RemoteFile(final DavResource davResource) {
+        this(Uri.decode(davResource.getLocation().encodedPath()));
+        final PropertyCollection properties = davResource.getProperties();
+        this.setCreationTimestamp(properties.get(CreationDate.class) != null
+                ? Long.parseLong(properties.get(CreationDate.class).getCreationDate())
+                : 0);
+        this.setMimeType(properties.get(GetContentType.class) != null
+                ? properties.get(GetContentType.class).getType()
+                : "");
+        this.setModifiedTimestamp(properties.get(GetLastModified.class).getLastModified());
+        this.setEtag(properties.get(GetETag.class).getETag());
+        this.setPermissions(properties.get(OCPermissions.class).getPermission());
+        this.setRemoteId(properties.get(OCId.class).getId());
+        this.setSize(properties.get(OCSize.class).getSize());
+        this.setQuotaUsedBytes(properties.get(QuotaUsedBytes.class) != null
+                ? BigDecimal.valueOf(
+                    properties.get(QuotaUsedBytes.class).getQuotaUsedBytes())
+                : BigDecimal.ZERO);
+        this.setQuotaAvailableBytes(properties.get(QuotaAvailableBytes.class) != null
+                ? BigDecimal.valueOf(
+                        properties.get(QuotaAvailableBytes.class).getQuotaAvailableBytes())
+                : BigDecimal.ZERO);
+        this.setPrivateLink(properties.get(OCPrivatelink.class).getLink());
+    }
+
     /**
      * Used internally. Reset all file properties
      */

From 5d0362dc4d6d456dedcc7ae7641c4e3bfed43830 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 24 May 2018 14:05:27 +0200
Subject: [PATCH 017/133] Use DavOCResource again

---
 dav4android                                   |  2 +-
 .../operations/PropfindOperation.java         | 12 +++--
 .../operations/UploadRemoteFileOperation.java | 47 +++++--------------
 3 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/dav4android b/dav4android
index 980eb7ec..a149a3ff 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 980eb7ece17314f6c88f87319be1541c579c4b94
+Subproject commit a149a3ff92a1149f02012086ed4de4b442efece5
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
index 367860b6..18c49f21 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.refactor.operations;
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
 
+import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
 import okhttp3.HttpUrl;
@@ -45,14 +46,15 @@ public class PropfindOperation extends RemoteOperation<DavResource> {
     @Override
     public Result exec() {
         try {
-            final HttpUrl location = HttpUrl.parse(getWebDavHttpUrl("/").toString());
+            final HttpUrl location = HttpUrl.parse(getWebDavHttpUrl(mRemotePath).toString());
 
-            DavResource davResource = new DavResource(getClient(), location);
-            davResource.propfind(1, PropertyUtils.INSTANCE.getAllPropSet());
+            DavOCResource davOCResource = new DavOCResource(getClient(), location);
+            davOCResource.propfind(1, PropertyUtils.INSTANCE.getAllPropSet());
+
+            return new Result(OK, davOCResource);
 
-            return new Result(OK, davResource);
         } catch (Exception e) {
             return new Result(e);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
index 15d4407e..8c019c8b 100644
--- a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
@@ -26,13 +26,11 @@ package com.owncloud.android.lib.refactor.operations;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.RemoteOperation;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
 
 import java.io.File;
 
-import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.DavOCResource;
 import okhttp3.MediaType;
-import okhttp3.Request;
 import okhttp3.RequestBody;
 
 import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
@@ -42,11 +40,6 @@ import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode
  */
 public class UploadRemoteFileOperation extends RemoteOperation<Void> {
 
-    private static final String CONTENT_TYPE_HEADER = "Content-Type";
-    private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
-    private static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
-    private static final String IF_MATCH_HEADER = "If-Match";
-
     private File mFileToUpload;
     private String mRemotePath;
     private String mMimeType;
@@ -71,20 +64,19 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
             MediaType mediaType = MediaType.parse(mMimeType);
             RequestBody requestBody = RequestBody.create(mediaType, mFileToUpload);
 
-            DavResource davResource = new DavResource(
-                    getClient()
-                            .newBuilder()
-                            .addInterceptor(chain ->
-                                    chain.proceed(
-                                            addUploadHeaders(chain.request())
-                                            .build()))
-                            .followRedirects(false)
-                            .build(),
-                    getWebDavHttpUrl(mRemotePath));
+            DavOCResource davOCResource = new DavOCResource(
+                    getClient(),
+                    getWebDavHttpUrl(mRemotePath)
+            );
 
-            davResource.put(requestBody,
+            davOCResource.put(
+                    requestBody,
                     null,
-                    false);
+                    false,
+                    "multipart/form-data",
+                    String.valueOf(mFileToUpload.length()),
+                    mFileLastModifTimestamp
+            );
 
         } catch (Exception e) {
             return new Result(e);
@@ -92,19 +84,4 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
 
         return new Result(OK);
     }
-
-    /**
-     * Add headers needed to upload a file
-     * @param request request in which include the headers
-     * @return request with upload headers
-     */
-    private Request.Builder addUploadHeaders (Request request) {
-
-        Request.Builder builder =  request.newBuilder();
-        builder.addHeader(CONTENT_TYPE_HEADER, "multipart/form-data");
-        builder.addHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(mFileToUpload.length()));
-        builder.addHeader(OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-
-        return builder;
-    }
 }
\ No newline at end of file

From 0f14e89d7c4fddd71e41df2d672ef068690e9002 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 25 May 2018 10:04:42 +0200
Subject: [PATCH 018/133] Check upload file result

---
 .../android/lib/sampleclient/MainActivity.java      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 870fc33d..bfb23acf 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -175,7 +175,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     
     private void startUpload() {
 
-
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
     	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
@@ -192,8 +191,18 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 				mimeType,
 				timeStamp
 		);
+		final Handler handler = new Handler();
 
-		new Thread(() -> uploadRemoteFileOperation.exec()).start();
+		new Thread(() -> {
+			final UploadRemoteFileOperation.Result result = uploadRemoteFileOperation.exec();
+			if (!result.isSuccess()) {
+				handler.post(() ->
+						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
+				return;
+			}
+			handler.post(() ->
+					Toast.makeText(this, "Upload successful", Toast.LENGTH_LONG).show());
+		}).start();
 
 //    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
 //    	uploadOperation.addDatatransferProgressListener(this);

From 81120ac7ad486ff3724b3086f8e9e73a9f95963d Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 25 May 2018 12:27:37 +0200
Subject: [PATCH 019/133] Create DownloadRemoteFileOperation and reorder
 classes

---
 .../lib/sampleclient/MainActivity.java        | 80 ++++++++++++-------
 .../lib/refactor/account/AccountUtils.java    |  3 +-
 .../oauth/OAuth2RequestBuilder.java           |  2 +-
 .../oauth/OwnCloudOAuth2RequestBuilder.java   |  2 +-
 .../OAuth2GetAccessTokenOperation.java        |  7 +-
 .../OAuth2RefreshAccessTokenOperation.java    |  5 +-
 .../{ => operations}/RemoteOperation.java     |  4 +-
 .../RemoteOperationResult.java                |  4 +-
 .../files/DownloadRemoteFileOperation.java    | 63 +++++++++++++++
 .../files}/PropfindOperation.java             | 10 +--
 .../files}/UploadRemoteFileOperation.java     | 17 ++--
 .../files/UploadRemoteFileOperation.java      | 33 ++++----
 12 files changed, 152 insertions(+), 78 deletions(-)
 rename src/com/owncloud/android/lib/refactor/{ => operations}/RemoteOperation.java (97%)
 rename src/com/owncloud/android/lib/refactor/{ => operations}/RemoteOperationResult.java (99%)
 create mode 100644 src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
 rename src/com/owncloud/android/lib/refactor/{operations => resources/files}/PropfindOperation.java (86%)
 rename src/com/owncloud/android/lib/refactor/{operations => resources/files}/UploadRemoteFileOperation.java (87%)

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index bfb23acf..c3954760 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -24,31 +24,6 @@
 
 package com.owncloud.android.lib.sampleclient;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.account.OCAccount;
-import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
-import com.owncloud.android.lib.refactor.operations.PropfindOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
-import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
-import com.owncloud.android.lib.refactor.operations.UploadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.FileUtils;
-
 import android.app.Activity;
 import android.content.res.AssetManager;
 import android.graphics.drawable.BitmapDrawable;
@@ -61,6 +36,31 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.account.OCAccount;
+import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.refactor.resources.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.refactor.resources.files.PropfindOperation;
+import com.owncloud.android.lib.refactor.resources.files.UploadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import at.bitfire.dav4android.DavResource;
 
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
@@ -223,9 +223,29 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
     	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
-    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
-    	downloadOperation.addDatatransferProgressListener(this);
-    	downloadOperation.execute(mClient, this, mHandler);
+
+		final DownloadRemoteFileOperation downloadRemoteFileOperation = new DownloadRemoteFileOperation(
+				mOCContext,
+				remotePath,
+				downFolder.getAbsolutePath()
+		);
+		final Handler handler = new Handler();
+
+		new Thread(() -> {
+			final DownloadRemoteFileOperation.Result result = downloadRemoteFileOperation.exec();
+			if (!result.isSuccess()) {
+				handler.post(() ->
+						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
+				return;
+			}
+			handler.post(() ->
+					Toast.makeText(this, "Download successful, pending file creation",
+							Toast.LENGTH_LONG).show());
+		}).start();
+
+//    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
+//    	downloadOperation.addDatatransferProgressListener(this);
+//    	downloadOperation.execute(mClient, this, mHandler);
     }
     
     @SuppressWarnings("deprecation")
@@ -255,8 +275,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		} else if (operation instanceof RemoveRemoteFileOperation ) {
 			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);
 			
-		} else if (operation instanceof DownloadRemoteFileOperation ) {
-			onSuccessfulDownload((DownloadRemoteFileOperation)operation, result);
+//		} else if (operation instanceof DownloadRemoteFileOperation ) {
+//			onSuccessfulDownload((DownloadRemoteFileOperation)operation, result);
 			
 		} else {
 			Toast.makeText(this, R.string.todo_operation_finished_in_success, Toast.LENGTH_SHORT).show();
diff --git a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
index c1568c2e..2abe32c4 100644
--- a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
+++ b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
@@ -34,8 +34,7 @@ import android.content.Context;
 import android.net.Uri;
 
 import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBearerCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
index 018280f8..dc49b525 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
@@ -26,7 +26,7 @@
 
 package com.owncloud.android.lib.refactor.authentication.oauth;
 
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
 public interface OAuth2RequestBuilder {
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
index e646a7d6..6a458149 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
@@ -29,7 +29,7 @@ package com.owncloud.android.lib.refactor.authentication.oauth;
 import android.net.Uri;
 
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2GetAccessTokenOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2RefreshAccessTokenOperation;
 
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
index f137e70b..0edaeacb 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
@@ -26,18 +26,15 @@
 
 package com.owncloud.android.lib.refactor.authentication.oauth.operations;
 
-import android.net.Uri;
-
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.operations.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
 import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Provider;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
 import org.json.JSONObject;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import okhttp3.MultipartBody;
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
index 5594ff6b..9453f613 100644
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
@@ -22,9 +22,9 @@
 package com.owncloud.android.lib.refactor.authentication.oauth.operations;
 
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.operations.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
@@ -32,7 +32,6 @@ import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Prov
 
 import org.json.JSONObject;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import okhttp3.MultipartBody;
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/RemoteOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
index 862ca8d3..dd1e355d 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
@@ -1,6 +1,8 @@
-package com.owncloud.android.lib.refactor;
+package com.owncloud.android.lib.refactor.operations;
 import android.net.Uri;
 
+import com.owncloud.android.lib.refactor.OCContext;
+
 import java.io.IOException;
 import java.util.Map;
 
diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java b/src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java
similarity index 99%
rename from src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
rename to src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java
index deef482c..87570a90 100644
--- a/src/com/owncloud/android/lib/refactor/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java
@@ -22,11 +22,12 @@
  *
  */
 
-package com.owncloud.android.lib.refactor;
+package com.owncloud.android.lib.refactor.operations;
 
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
+import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 import com.owncloud.android.lib.refactor.exceptions.CertificateCombinedException;
 import com.owncloud.android.lib.refactor.exceptions.OperationCancelledException;
@@ -50,7 +51,6 @@ import java.util.Map;
 
 import javax.net.ssl.SSLException;
 
-import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.exception.ConflictException;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
new file mode 100644
index 00000000..1b664e33
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
@@ -0,0 +1,63 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ */
+
+package com.owncloud.android.lib.refactor.resources.files;
+
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
+import at.bitfire.dav4android.DavOCResource;
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
+
+/**
+ * @author David González Verdugo
+ */
+public class DownloadRemoteFileOperation extends RemoteOperation<Void> {
+
+    private String mRemotePath;
+    private String mLocalFolderPath;
+
+    public DownloadRemoteFileOperation(OCContext ocContext, String remotePath, String localFolderPath) {
+        super(ocContext);
+        mRemotePath = remotePath.replaceAll("^/+", "");
+        mLocalFolderPath = localFolderPath;
+    }
+
+    @Override
+    public Result exec() {
+
+        try {
+            DavOCResource davOCResource = new DavOCResource(
+                    getClient(),
+                    getWebDavHttpUrl(mRemotePath)
+            );
+            davOCResource.get("*/*");
+
+            //TODO Create local file from the downloaded one
+
+            return new Result(OK);
+
+        } catch (Exception e) {
+            return new Result(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
similarity index 86%
rename from src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
rename to src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
index 18c49f21..85d2192f 100644
--- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
@@ -22,24 +22,24 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.operations;
+package com.owncloud.android.lib.refactor.resources.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
 import okhttp3.HttpUrl;
 
-import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
 
 public class PropfindOperation extends RemoteOperation<DavResource> {
 
     private String mRemotePath;
 
-    public PropfindOperation(OCContext context, String remotePath) {
-        super(context);
+    public PropfindOperation(OCContext ocContext, String remotePath) {
+        super(ocContext);
         mRemotePath = remotePath;
     }
 
diff --git a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
similarity index 87%
rename from src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
index 8c019c8b..8f6b1c2c 100644
--- a/src/com/owncloud/android/lib/refactor/operations/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
@@ -19,21 +19,18 @@
  *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
- *
  */
 
-package com.owncloud.android.lib.refactor.operations;
+package com.owncloud.android.lib.refactor.resources.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
-
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import java.io.File;
-
 import at.bitfire.dav4android.DavOCResource;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
-import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
  * @author David González Verdugo
@@ -46,9 +43,9 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
     private String mFileLastModifTimestamp;
 
 
-    public UploadRemoteFileOperation(OCContext context, String localPath, String remotePath, String mimetype,
+    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimetype,
                                      String fileLastModifTimestamp) {
-        super(context);
+        super(ocContext);
 
         mFileToUpload = new File(localPath);
         mRemotePath = remotePath.replaceAll("^/+", ""); //Delete leading slashes
@@ -78,10 +75,10 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
                     mFileLastModifTimestamp
             );
 
+            return new Result(OK);
+
         } catch (Exception e) {
             return new Result(e);
         }
-
-        return new Result(OK);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 74dbdab7..9f7c7c19 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,13 +24,14 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.network.FileRequestEntity;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
+import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.OperationCancelledException;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
 import org.apache.commons.httpclient.HttpStatus;
@@ -38,22 +39,18 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.network.FileRequestEntity;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Remote operation performing the upload of a remote file to the ownCloud server.
  * 
  * @author David A. Velasco
  * @author masensio
+ * @author David González Verdugo
  */
 
 public class UploadRemoteFileOperation extends RemoteOperation {

From 74c9430382dc4283e722279932bec9cfb9d94378 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 25 May 2018 14:22:20 +0200
Subject: [PATCH 020/133] Create RemoveRemoteFileOperation and use it

---
 .../lib/sampleclient/MainActivity.java        | 44 +++++++++----
 .../refactor/operations/RemoteOperation.java  |  4 +-
 .../files/DownloadRemoteFileOperation.java    |  6 +-
 .../files/RemoveRemoteFileOperation.java      | 65 +++++++++++++++++++
 .../files/RemoveRemoteFileOperation.java      |  4 +-
 5 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index c3954760..58d9ea6b 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -47,11 +47,11 @@ import com.owncloud.android.lib.refactor.account.OCAccount;
 import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.refactor.resources.files.DownloadRemoteFileOperation;
 import com.owncloud.android.lib.refactor.resources.files.PropfindOperation;
+import com.owncloud.android.lib.refactor.resources.files.RemoveRemoteFileOperation;
 import com.owncloud.android.lib.refactor.resources.files.UploadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -167,7 +167,10 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			for(DavResource el : result.getData().getMembers()) {
 				remoteFiles.add(new RemoteFile(el));
 			}
-			handler.post(() -> mFilesAdapter.addAll(remoteFiles));
+			handler.post(() -> {
+				mFilesAdapter.clear();
+				mFilesAdapter.addAll(remoteFiles);
+			});
 		}).start();
 //    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
 //    	refreshOperation.execute(mClient, this, mHandler);
@@ -210,11 +213,30 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     }
 
     private void startRemoteDeletion() {
-    	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-    	File fileToUpload = upFolder.listFiles()[0];
-    	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
-    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
-    	removeOperation.execute(mClient, this, mHandler);
+		File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
+		File fileToUpload = upFolder.listFiles()[0];
+		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
+
+		final RemoveRemoteFileOperation removeRemoteFileOperation = new RemoveRemoteFileOperation(
+				mOCContext,
+				remotePath
+		);
+		final Handler handler = new Handler();
+
+		new Thread(() -> {
+			final RemoveRemoteFileOperation.Result result = removeRemoteFileOperation.exec();
+			if (!result.isSuccess()) {
+				handler.post(() ->
+						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
+				return;
+			}
+			handler.post(() ->
+					Toast.makeText(this, "Delete successful", Toast.LENGTH_LONG).show());
+		}).start();
+
+
+//    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
+//    	removeOperation.execute(mClient, this, mHandler);
     }
 
     private void startDownload() {
@@ -272,9 +294,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		} else if (operation instanceof com.owncloud.android.lib.resources.files.UploadRemoteFileOperation) {
 			onSuccessfulUpload((com.owncloud.android.lib.resources.files.UploadRemoteFileOperation)operation, result);
 			
-		} else if (operation instanceof RemoveRemoteFileOperation ) {
-			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);
-			
+//		} else if (operation instanceof RemoveRemoteFileOperation ) {
+//			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);
+//
 //		} else if (operation instanceof DownloadRemoteFileOperation ) {
 //			onSuccessfulDownload((DownloadRemoteFileOperation)operation, result);
 			
diff --git a/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
index dd1e355d..99fe0713 100644
--- a/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
@@ -52,8 +52,8 @@ public abstract class RemoteOperation<I extends Object> {
     }
 
 
-    protected RemoteOperation(OCContext context) {
-        mContext = context;
+    protected RemoteOperation(OCContext ocContext) {
+        mContext = ocContext;
         if(mClient == null) {
             mClient = new OkHttpClient.Builder()
                     .followRedirects(false)
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
index 1b664e33..e3634e34 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
@@ -29,6 +29,10 @@ import at.bitfire.dav4android.DavOCResource;
 import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
+ * Remote operation performing the download of a remote file in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
  * @author David González Verdugo
  */
 public class DownloadRemoteFileOperation extends RemoteOperation<Void> {
@@ -52,7 +56,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation<Void> {
             );
             davOCResource.get("*/*");
 
-            //TODO Create local file from the downloaded one
+            //TODO Create local file from the downloaded one and implement progress listener
 
             return new Result(OK);
 
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java
new file mode 100644
index 00000000..93a57a5a
--- /dev/null
+++ b/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java
@@ -0,0 +1,65 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.refactor.resources.files;
+
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
+import at.bitfire.dav4android.DavOCResource;
+
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
+
+/**
+ * Remote operation performing the removal of a remote file or folder in the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author masensio
+ * @author David González Verdugo
+ */
+public class RemoveRemoteFileOperation extends RemoteOperation<Void> {
+
+    private String mRemotePath;
+
+    public RemoveRemoteFileOperation(OCContext ocContext, String remotePath) {
+        super(ocContext);
+
+        mRemotePath = remotePath;
+    }
+
+    @Override
+    public Result exec() {
+        try {
+            DavOCResource davOCResource = new DavOCResource(
+                    getClient(),
+                    getWebDavHttpUrl(mRemotePath)
+            );
+            davOCResource.delete(null);
+
+            return new Result(OK);
+
+        } catch (Exception e) {
+            return new Result(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 2f15adeb..4e46fe97 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -38,6 +38,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
  *
  * @author David A. Velasco
  * @author masensio
+ * @author David González Verdugo
  */
 public class RemoveRemoteFileOperation extends RemoteOperation {
     private static final String TAG = RemoveRemoteFileOperation.class.getSimpleName();
@@ -88,5 +89,4 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
 
         return result;
     }
-
-}
+}
\ No newline at end of file

From ce86ebac8a3385d15e4afaac35e7421548e8d6f9 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Mon, 28 May 2018 12:41:21 +0200
Subject: [PATCH 021/133] make propfind compatible with frontend

---
 .../android/lib/refactor/account/OCAccount.java  |  6 ++++--
 .../resources/files/PropfindOperation.java       |  1 +
 .../files/UploadRemoteFileOperation.java         |  3 +--
 .../android/lib/resources/files/RemoteFile.java  | 16 +++++++++++++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/com/owncloud/android/lib/refactor/account/OCAccount.java b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
index 007722ec..a84eac2d 100644
--- a/src/com/owncloud/android/lib/refactor/account/OCAccount.java
+++ b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
@@ -35,6 +35,8 @@ import com.owncloud.android.lib.refactor.authentication.credentials.OCAnonymousC
 import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
 import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 
+import org.apache.commons.httpclient.auth.AuthenticationException;
+
 import java.io.IOException;
 
 /**
@@ -56,7 +58,7 @@ public class OCAccount {
      *
      * Do not use for anonymous credentials.
      */
-    public OCAccount(Account savedAccount, Context context) throws AccountNotFoundException {
+    public OCAccount(Account savedAccount, Context context) throws AccountNotFoundException, IOException, OperationCanceledException, AuthenticatorException {
         if (savedAccount == null) {
             throw new IllegalArgumentException("Parameter 'savedAccount' cannot be null");
         }
@@ -67,7 +69,7 @@ public class OCAccount {
 
         mSavedAccount = savedAccount;
         mSavedAccountName = savedAccount.name;
-        mCredentials = null;    // load of credentials is delayed
+        mCredentials = AccountUtils.getCredentialsForAccount(context, savedAccount);
 
         AccountManager ama = AccountManager.get(context.getApplicationContext());
         String baseUrl = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_OC_BASE_URL);
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
index 85d2192f..83ce0964 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
@@ -54,6 +54,7 @@ public class PropfindOperation extends RemoteOperation<DavResource> {
             return new Result(OK, davOCResource);
 
         } catch (Exception e) {
+            e.printStackTrace();
             return new Result(e);
         }
     }
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
index 8f6b1c2c..1152ad44 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
@@ -63,8 +63,7 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
 
             DavOCResource davOCResource = new DavOCResource(
                     getClient(),
-                    getWebDavHttpUrl(mRemotePath)
-            );
+                    getWebDavHttpUrl(mRemotePath));
 
             davOCResource.put(
                     requestBody,
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index f2e85871..939031db 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -32,6 +32,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.owncloud.android.lib.common.network.WebdavEntry;
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.RemoteOperation;
 
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyCollection;
@@ -45,6 +47,7 @@ import at.bitfire.dav4android.property.owncloud.OCId;
 import at.bitfire.dav4android.property.owncloud.OCPermissions;
 import at.bitfire.dav4android.property.owncloud.OCPrivatelink;
 import at.bitfire.dav4android.property.owncloud.OCSize;
+import okhttp3.HttpUrl;
 
 /**
  * Contains the data of a Remote File from a WebDavEntry
@@ -198,15 +201,15 @@ public class RemoteFile implements Parcelable, Serializable {
         this.setPrivateLink(webdavEntry.privateLink());
     }
 
-    public RemoteFile(final DavResource davResource) {
-        this(Uri.decode(davResource.getLocation().encodedPath()));
+    public RemoteFile(final DavResource davResource, OCContext context) {
+        this(getRemotePathFromUrl(davResource.getLocation(), context));
         final PropertyCollection properties = davResource.getProperties();
         this.setCreationTimestamp(properties.get(CreationDate.class) != null
                 ? Long.parseLong(properties.get(CreationDate.class).getCreationDate())
                 : 0);
         this.setMimeType(properties.get(GetContentType.class) != null
                 ? properties.get(GetContentType.class).getType()
-                : "");
+                : "DIR");
         this.setModifiedTimestamp(properties.get(GetLastModified.class).getLastModified());
         this.setEtag(properties.get(GetETag.class).getETag());
         this.setPermissions(properties.get(OCPermissions.class).getPermission());
@@ -223,6 +226,13 @@ public class RemoteFile implements Parcelable, Serializable {
         this.setPrivateLink(properties.get(OCPrivatelink.class).getLink());
     }
 
+
+    private static String getRemotePathFromUrl(HttpUrl url, OCContext context) {
+        final String pathToRemove =
+                "/" + RemoteOperation.WEBDAV_PATH_4_0 + "/" + context.getOCAccount().getDisplayName();
+        return Uri.decode(url.encodedPath()).replace(pathToRemove, "");
+    }
+
     /**
      * Used internally. Reset all file properties
      */

From 81d3d832e98042f67fb96ebd373fad576b408193 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Mon, 28 May 2018 13:36:31 +0200
Subject: [PATCH 022/133] restructure path to operation resources

---
 .../owncloud/android/lib/sampleclient/MainActivity.java   | 8 ++++----
 .../files/DownloadRemoteFileOperation.java                | 2 +-
 .../files/PropfindOperation.java                          | 2 +-
 .../files/RemoveRemoteFileOperation.java                  | 2 +-
 .../files/UploadRemoteFileOperation.java                  | 2 +-
 .../owncloud/android/lib/resources/files/RemoteFile.java  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/com/owncloud/android/lib/refactor/{resources => operations}/files/DownloadRemoteFileOperation.java (97%)
 rename src/com/owncloud/android/lib/refactor/{resources => operations}/files/PropfindOperation.java (97%)
 rename src/com/owncloud/android/lib/refactor/{resources => operations}/files/RemoveRemoteFileOperation.java (97%)
 rename src/com/owncloud/android/lib/refactor/{resources => operations}/files/UploadRemoteFileOperation.java (98%)

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 58d9ea6b..01d6d252 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -45,10 +45,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.account.OCAccount;
 import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.refactor.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.refactor.resources.files.PropfindOperation;
-import com.owncloud.android.lib.refactor.resources.files.RemoveRemoteFileOperation;
-import com.owncloud.android.lib.refactor.resources.files.UploadRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.files.PropfindOperation;
+import com.owncloud.android.lib.refactor.operations.files.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.files.UploadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
index e3634e34..e754e199 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
@@ -21,7 +21,7 @@
  *   THE SOFTWARE.
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
index 83ce0964..782e0f18 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
index 93a57a5a..3d96ee46 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
similarity index 98%
rename from src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
index 1152ad44..d6a06663 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
@@ -21,7 +21,7 @@
  *   THE SOFTWARE.
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 939031db..ebfcb1a1 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -33,7 +33,7 @@ import android.os.Parcelable;
 
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyCollection;

From 81cea2788d4398463446e2047b8c00d4f8c8f1cd Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 28 May 2018 15:01:14 +0200
Subject: [PATCH 023/133] Upload file operation [WIP]

---
 .../files/UploadRemoteFileOperation.java      | 23 +++++++++++++++++--
 .../files/UploadRemoteFileOperation.java      |  3 +--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
index d6a06663..565df53e 100644
--- a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
@@ -26,6 +26,8 @@ package com.owncloud.android.lib.refactor.operations.files;
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import at.bitfire.dav4android.DavOCResource;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
@@ -41,18 +43,27 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
     private String mRemotePath;
     private String mMimeType;
     private String mFileLastModifTimestamp;
+    private String mRequiredEtag;
+
+    protected final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
 
 
-    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimetype,
+    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimeType,
                                      String fileLastModifTimestamp) {
         super(ocContext);
 
         mFileToUpload = new File(localPath);
         mRemotePath = remotePath.replaceAll("^/+", ""); //Delete leading slashes
-        mMimeType = mimetype;
+        mMimeType = mimeType;
         mFileLastModifTimestamp = fileLastModifTimestamp;
     }
 
+    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimeType,
+                                     String requiredEtag, String fileLastModifTimestamp) {
+        this(ocContext, localPath, remotePath, mimeType, fileLastModifTimestamp);
+        mRequiredEtag = requiredEtag;
+    }
+
     @Override
     public Result exec() {
 
@@ -80,4 +91,12 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
             return new Result(e);
         }
     }
+
+    public void cancel() {
+        synchronized (mCancellationRequested) {
+            mCancellationRequested.set(true);
+            if (mPutMethod != null)
+                mPutMethod.abort();
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 9f7c7c19..6c232542 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -194,5 +194,4 @@ public class UploadRemoteFileOperation extends RemoteOperation {
                 mPutMethod.abort();
         }
     }
-
-}
+}
\ No newline at end of file

From 2b333b8ff0bff744cb91aa1504d1eeb31e8bd4f5 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 30 May 2018 09:58:59 +0200
Subject: [PATCH 024/133] Update dav4droid dependency

---
 dav4android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dav4android b/dav4android
index a149a3ff..054d7b57 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit a149a3ff92a1149f02012086ed4de4b442efece5
+Subproject commit 054d7b57b27d7c258d717c8a326eed89e195d168

From 275a0f0f10bd40129dcea1ff3d843fd1b6e09eb7 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 31 May 2018 12:07:09 +0200
Subject: [PATCH 025/133] Update ownCloucClient to use OkHttpClient [WIP]

---
 .../android/lib/common/OwnCloudClient.java    | 81 +++++++++++--------
 1 file changed, 47 insertions(+), 34 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 8ef9cd6e..27669499 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -25,24 +25,6 @@
 
 package com.owncloud.android.lib.common;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.HttpVersion;
-import org.apache.commons.httpclient.URI;
-import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.httpclient.params.HttpParams;
-
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.content.Context;
@@ -51,12 +33,30 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-public class OwnCloudClient extends HttpClient {
+import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpConnectionManager;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.URI;
+import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.apache.commons.httpclient.params.HttpParams;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+
+public class OwnCloudClient {
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
     public static final String STATUS_PATH = "/status.php";
@@ -68,6 +68,7 @@ public class OwnCloudClient extends HttpClient {
     private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
+    private static final String USER_AGENT_HEADER = "User-Agent";
 
     private static byte[] sExhaustBuffer = new byte[1024];
 
@@ -99,11 +100,29 @@ public class OwnCloudClient extends HttpClient {
 
     private String mRedirectedLocation;
 
+    private static OkHttpClient mClient = null;
+
     /**
      * Constructor
      */
     public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr) {
-        super(connectionMgr);
+
+        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
+
+        if (mClient == null) {
+            new OkHttpClient.Builder()
+                    .addInterceptor(chain ->
+                            chain.proceed(
+                                    chain.request()
+                                    .newBuilder()
+                                    .addHeader(USER_AGENT_HEADER, userAgent)
+                                    .build()
+                            )
+                    )
+                    .protocols(Arrays.asList(Protocol.HTTP_1_1))
+                    .followRedirects(false)
+                    .build();
+        }
 
         if (baseUri == null) {
             throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
@@ -113,20 +132,14 @@ public class OwnCloudClient extends HttpClient {
         mInstanceNumber = sIntanceCounter++;
         Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
 
-        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
-        getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
-        getParams().setParameter(
-            PARAM_PROTOCOL_VERSION,
-            HttpVersion.HTTP_1_1
-        );
+        //TODO
+//        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
+//        getParams().setParameter(
+//            PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
+//            PARAM_SINGLE_COOKIE_HEADER_VALUE
+//        );
 
-        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
-        getParams().setParameter(
-            PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
-            PARAM_SINGLE_COOKIE_HEADER_VALUE
-        );
-
-        applyProxySettings();
+//        applyProxySettings();
 
         clearCredentials();
     }

From b9ba124541684b368a05aca8a02599f34184b06d Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 31 May 2018 14:21:53 +0200
Subject: [PATCH 026/133] Keep previous owncloudclient implementation

---
 .../lib/sampleclient/MainActivity.java        | 11 ++---
 .../android/lib/common/OwnCloudClient.java    | 42 +++++++++++++++++--
 .../files/UploadRemoteFileOperation.java      | 14 +++----
 3 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 01d6d252..c8f1dfa9 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -53,6 +53,8 @@ import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
 
+import at.bitfire.dav4android.DavResource;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -61,8 +63,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import at.bitfire.dav4android.DavResource;
-
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
 	private static String LOG_TAG = MainActivity.class.getCanonicalName();
@@ -164,10 +164,11 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
 				return;
 			}
-			for(DavResource el : result.getData().getMembers()) {
-				remoteFiles.add(new RemoteFile(el));
-			}
+//			for(DavResource el : result.getData().getMembers()) {
+//				remoteFiles.add(new RemoteFile(el));
+//			}
 			handler.post(() -> {
+				Toast.makeText(this, result.getData().getMembers().toString(), Toast.LENGTH_LONG).show();
 				mFilesAdapter.clear();
 				mFilesAdapter.addAll(remoteFiles);
 			});
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 27669499..cf73c15b 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -40,12 +40,15 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import org.apache.commons.httpclient.Cookie;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.HttpVersion;
 import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
 
@@ -56,7 +59,7 @@ import java.util.Arrays;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 
-public class OwnCloudClient {
+public class OwnCloudClient extends HttpClient {
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
     public static final String STATUS_PATH = "/status.php";
@@ -107,6 +110,36 @@ public class OwnCloudClient {
      */
     public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr) {
 
+        super(connectionMgr);
+
+        if (baseUri == null) {
+            throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
+        }
+        mBaseUri = baseUri;
+
+        mInstanceNumber = sIntanceCounter++;
+        Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
+
+        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
+        getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
+        getParams().setParameter(
+                PARAM_PROTOCOL_VERSION,
+                HttpVersion.HTTP_1_1
+        );
+
+        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
+        getParams().setParameter(
+                PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
+                PARAM_SINGLE_COOKIE_HEADER_VALUE
+        );
+
+        applyProxySettings();
+
+        clearCredentials();
+    }
+
+    public OwnCloudClient(Uri baseUri) {
+
         String userAgent = OwnCloudClientManagerFactory.getUserAgent();
 
         if (mClient == null) {
@@ -114,9 +147,9 @@ public class OwnCloudClient {
                     .addInterceptor(chain ->
                             chain.proceed(
                                     chain.request()
-                                    .newBuilder()
-                                    .addHeader(USER_AGENT_HEADER, userAgent)
-                                    .build()
+                                            .newBuilder()
+                                            .addHeader(USER_AGENT_HEADER, userAgent)
+                                            .build()
                             )
                     )
                     .protocols(Arrays.asList(Protocol.HTTP_1_1))
@@ -142,6 +175,7 @@ public class OwnCloudClient {
 //        applyProxySettings();
 
         clearCredentials();
+
     }
 
 
diff --git a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
index 565df53e..a98ff439 100644
--- a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
@@ -92,11 +92,11 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
         }
     }
 
-    public void cancel() {
-        synchronized (mCancellationRequested) {
-            mCancellationRequested.set(true);
-            if (mPutMethod != null)
-                mPutMethod.abort();
-        }
-    }
+//    public void cancel() {
+//        synchronized (mCancellationRequested) {
+//            mCancellationRequested.set(true);
+//            if (mPutMethod != null)
+//                mPutMethod.abort();
+//        }
+//    }
 }
\ No newline at end of file

From 11938a1fccfcdb0b8b6dd2fbfd4695fe1ca62fe4 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 1 Jun 2018 08:52:08 +0200
Subject: [PATCH 027/133] Create http + webdav methods wrapeer

---
 .../android/lib/common/OwnCloudClient.java    | 82 ++++++++++---------
 .../OwnCloudBasicCredentials.java             | 26 ++++--
 .../android/lib/common/methods/DavMethod.java | 14 ++++
 .../lib/common/methods/HttpBaseMethod.java    |  6 ++
 .../lib/common/methods/PropfindMethod.java    | 23 ++++++
 .../files/UploadRemoteFileOperation.java      | 11 +--
 .../files/ReadRemoteFolderOperation.java      | 76 +++++++++--------
 7 files changed, 153 insertions(+), 85 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/methods/DavMethod.java
 create mode 100644 src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
 create mode 100644 src/com/owncloud/android/lib/common/methods/PropfindMethod.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index cf73c15b..f9ed3e00 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -45,12 +45,11 @@ import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.HttpVersion;
 import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
+import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -103,47 +102,50 @@ public class OwnCloudClient extends HttpClient {
 
     private String mRedirectedLocation;
 
-    private static OkHttpClient mClient = null;
+    private static OkHttpClient mOkHttpClient = null;
 
     /**
      * Constructor
      */
+
+//    public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr) {
+//
+//        super(connectionMgr);
+//
+//        if (baseUri == null) {
+//            throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
+//        }
+//        mBaseUri = baseUri;
+//
+//        mInstanceNumber = sIntanceCounter++;
+//        Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
+//
+//        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
+//        getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
+//        getParams().setParameter(
+//                PARAM_PROTOCOL_VERSION,
+//                HttpVersion.HTTP_1_1
+//        );
+//
+//        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
+//        getParams().setParameter(
+//                PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
+//                PARAM_SINGLE_COOKIE_HEADER_VALUE
+//        );
+//
+//        applyProxySettings();
+//
+//        clearCredentials();
+//    }
+
     public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr) {
 
         super(connectionMgr);
 
-        if (baseUri == null) {
-            throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
-        }
-        mBaseUri = baseUri;
-
-        mInstanceNumber = sIntanceCounter++;
-        Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
-
-        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
-        getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
-        getParams().setParameter(
-                PARAM_PROTOCOL_VERSION,
-                HttpVersion.HTTP_1_1
-        );
-
-        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
-        getParams().setParameter(
-                PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
-                PARAM_SINGLE_COOKIE_HEADER_VALUE
-        );
-
-        applyProxySettings();
-
-        clearCredentials();
-    }
-
-    public OwnCloudClient(Uri baseUri) {
-
         String userAgent = OwnCloudClientManagerFactory.getUserAgent();
 
-        if (mClient == null) {
-            new OkHttpClient.Builder()
+        if (mOkHttpClient == null) {
+            mOkHttpClient = new OkHttpClient.Builder()
                     .addInterceptor(chain ->
                             chain.proceed(
                                     chain.request()
@@ -175,10 +177,8 @@ public class OwnCloudClient extends HttpClient {
 //        applyProxySettings();
 
         clearCredentials();
-
     }
 
-
     private void applyProxySettings() {
         String proxyHost = System.getProperty("http.proxyHost");
         String proxyPortSt = System.getProperty("http.proxyPort");
@@ -198,7 +198,6 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-
     public void setCredentials(OwnCloudCredentials credentials) {
         if (credentials != null) {
             mCredentials = credentials;
@@ -248,7 +247,6 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-
     /**
      * Requests the received method.
      *
@@ -300,6 +298,11 @@ public class OwnCloudClient extends HttpClient {
         return status;
     }
 
+    public int executeHttpMethod (HttpBaseMethod method) throws Exception {
+        int status = method.execute();
+        return status;
+    }
+
     private void checkFirstRedirection(HttpMethod method) {
         Header[] httpHeaders = method.getResponseHeaders();
 
@@ -338,7 +341,6 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-
     public RedirectionPath followRedirection(HttpMethod method) throws IOException {
         int redirectionsCount = 0;
         int status = method.getStatusCode();
@@ -562,6 +564,10 @@ public class OwnCloudClient extends HttpClient {
         return mAccount;
     }
 
+    public OkHttpClient getOkHttpClient() {
+        return mOkHttpClient;
+    }
+
     /**
      * Enables or disables silent refresh of credentials, if supported by credentials themselves.
      */
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 96ed4568..6897b8c8 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -25,15 +25,17 @@ package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.auth.AuthState;
 import org.apache.commons.httpclient.auth.BasicScheme;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Credentials;
+
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
     private String mUsername;
@@ -58,14 +60,22 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
         List<String> authPrefs = new ArrayList<String>(1);
         authPrefs.add(AuthPolicy.BASIC);
-        client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
 
+        client.getOkHttpClient().newBuilder()
+                .addInterceptor(chain ->
+                        chain.proceed(
+                                chain.request()
+                                        .newBuilder()
+                                        .addHeader("Authorization", Credentials.basic(mUsername, mPassword))
+                                        .build()
+                        )
+                ).build();
+
+        //TODO
+        client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
         client.getParams().setAuthenticationPreemptive(mAuthenticationPreemptive);
         client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
-        client.getState().setCredentials(
-            AuthScope.ANY,
-            new UsernamePasswordCredentials(mUsername, mPassword)
-        );
+        client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(mUsername, mPassword));
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/methods/DavMethod.java b/src/com/owncloud/android/lib/common/methods/DavMethod.java
new file mode 100644
index 00000000..517650c8
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/methods/DavMethod.java
@@ -0,0 +1,14 @@
+package com.owncloud.android.lib.common.methods;
+
+import java.io.IOException;
+
+import at.bitfire.dav4android.DavResource;
+
+public abstract class DavMethod implements HttpBaseMethod {
+
+    protected DavResource mDavResource;
+
+    public DavMethod(DavResource davResource) {
+        mDavResource = davResource;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
new file mode 100644
index 00000000..01a9ced3
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
@@ -0,0 +1,6 @@
+package com.owncloud.android.lib.common.methods;
+
+public interface HttpBaseMethod {
+
+    int execute() throws Exception;
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/PropfindMethod.java b/src/com/owncloud/android/lib/common/methods/PropfindMethod.java
new file mode 100644
index 00000000..2b1b1aa3
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/methods/PropfindMethod.java
@@ -0,0 +1,23 @@
+package com.owncloud.android.lib.common.methods;
+
+import java.io.IOException;
+
+import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.PropertyUtils;
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+
+public class PropfindMethod extends DavMethod {
+
+    private int mDepth;
+
+    public PropfindMethod(DavResource davResource, int depth) {
+        super(davResource);
+        mDepth = depth;
+    };
+
+    public int execute() throws DavException, IOException, HttpException {
+        mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
+        return mDavResource.getResponse().code();
+    }
+}
diff --git a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
index a98ff439..612d1139 100644
--- a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
@@ -92,11 +92,12 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
         }
     }
 
-//    public void cancel() {
-//        synchronized (mCancellationRequested) {
-//            mCancellationRequested.set(true);
+    public void cancel() {
+        synchronized (mCancellationRequested) {
+            mCancellationRequested.set(true);
+            // TODO
 //            if (mPutMethod != null)
 //                mPutMethod.abort();
-//        }
-//    }
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index cd3616b1..40ebba29 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -24,21 +24,22 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.util.ArrayList;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavConstants;
-import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.methods.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import at.bitfire.dav4android.DavResource;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.jackrabbit.webdav.MultiStatus;
+import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+
+import java.util.ArrayList;
+
+import at.bitfire.dav4android.DavOCResource;
+import okhttp3.HttpUrl;
 
 /**
  * Remote operation performing the read of remote file or folder in the ownCloud server.
@@ -75,32 +76,40 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 
         try {
 
+            final HttpUrl location = HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
+            DavOCResource davOCResource = new DavOCResource(client.getOkHttpClient(), location);
+            PropfindMethod propfindMethod = new PropfindMethod(davOCResource, 1);
+
+            int status = client.executeHttpMethod(propfindMethod);
+
+            // TODO Refactor from here down
+
             // remote request
-            query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
-                WebdavUtils.getAllPropSet(),    // PropFind Properties
-                DavConstants.DEPTH_1);
-            int status = client.executeMethod(query);
-
-            // check and process response
-            boolean isSuccess = (
-                status == HttpStatus.SC_MULTI_STATUS ||
-                    status == HttpStatus.SC_OK
-            );
-            if (isSuccess) {
-                // get data from remote folder
-                MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
-                readData(dataInServer, client);
-
-                // Result of the operation
-                result = new RemoteOperationResult(true, query);
-                // Add data to the result
-                if (result.isSuccess()) {
-                    result.setData(mFolderAndFiles);
-                }
-            } else {
-                // synchronization failed
-                result = new RemoteOperationResult(false, query);
-            }
+//            query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
+//                WebdavUtils.getAllPropSet(),    // PropFind Properties
+//                DavConstants.DEPTH_1);
+//            int status = client.executeMethod(query);
+//
+//            // check and process response
+//            boolean isSuccess = (
+//                status == HttpStatus.SC_MULTI_STATUS ||
+//                    status == HttpStatus.SC_OK
+//            );
+//            if (isSuccess) {
+//                // get data from remote folder
+//                MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
+//                readData(dataInServer, client);
+//
+//                // Result of the operation
+//                result = new RemoteOperationResult(true, query);
+//                // Add data to the result
+//                if (result.isSuccess()) {
+//                    result.setData(mFolderAndFiles);
+//                }
+//            } else {
+//                // synchronization failed
+//                result = new RemoteOperationResult(false, query);
+//            }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
@@ -119,7 +128,6 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
                     Log_OC.e(TAG, "Synchronized " + mRemotePath + ": " + result.getLogMessage());
                 }
             }
-
         }
         return result;
     }

From d67a41d5cc5d5e6b27360052bb671e3f892e620c Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 4 Jun 2018 09:21:10 +0200
Subject: [PATCH 028/133] Include credentials [WIP]

---
 .../android/lib/common/OwnCloudClient.java    | 21 +++++++++++++++++--
 .../OwnCloudBasicCredentials.java             |  2 +-
 .../android/lib/common/methods/DavMethod.java |  2 --
 .../lib/common/methods/HttpBaseMethod.java    |  1 -
 .../lib/common/methods/PropfindMethod.java    | 11 +++++++---
 .../operations/RemoteOperationResult.java     |  1 -
 .../files/ReadRemoteFolderOperation.java      |  9 +++-----
 7 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index f9ed3e00..10e46fd5 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -33,6 +33,7 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
+import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
@@ -49,7 +50,6 @@ import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
-import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -61,6 +61,7 @@ import okhttp3.Protocol;
 public class OwnCloudClient extends HttpClient {
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
+    public static final String NEW_WEBDAV_PATH_4_0 = "/remote.php/dav/files/";
     public static final String STATUS_PATH = "/status.php";
     public static final String FILES_WEB_PATH = "/index.php/apps/files";
 
@@ -299,7 +300,19 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public int executeHttpMethod (HttpBaseMethod method) throws Exception {
-        int status = method.execute();
+
+        boolean repeatWithFreshCredentials = false;
+        int repeatCounter = 0;
+        int status;
+
+        do {
+            status = method.execute();
+            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
+            if (repeatWithFreshCredentials) {
+                repeatCounter++;
+            }
+        } while (repeatWithFreshCredentials);
+
         return status;
     }
 
@@ -432,6 +445,10 @@ public class OwnCloudClient extends HttpClient {
         return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
     }
 
+    public Uri getNewWebDavUri() {
+        return Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0 + mCredentials.getUsername());
+    }
+
     /**
      * Sets the root URI to the ownCloud server.
      *
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 6897b8c8..2e851762 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -58,7 +58,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
     public void applyTo(OwnCloudClient client) {
         AuthPolicy.registerAuthScheme(AuthState.PREEMPTIVE_AUTH_SCHEME, BasicScheme.class);
 
-        List<String> authPrefs = new ArrayList<String>(1);
+        List<String> authPrefs = new ArrayList<>(1);
         authPrefs.add(AuthPolicy.BASIC);
 
         client.getOkHttpClient().newBuilder()
diff --git a/src/com/owncloud/android/lib/common/methods/DavMethod.java b/src/com/owncloud/android/lib/common/methods/DavMethod.java
index 517650c8..e7a092e6 100644
--- a/src/com/owncloud/android/lib/common/methods/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/DavMethod.java
@@ -1,7 +1,5 @@
 package com.owncloud.android.lib.common.methods;
 
-import java.io.IOException;
-
 import at.bitfire.dav4android.DavResource;
 
 public abstract class DavMethod implements HttpBaseMethod {
diff --git a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
index 01a9ced3..c153d086 100644
--- a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
@@ -1,6 +1,5 @@
 package com.owncloud.android.lib.common.methods;
 
 public interface HttpBaseMethod {
-
     int execute() throws Exception;
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/PropfindMethod.java b/src/com/owncloud/android/lib/common/methods/PropfindMethod.java
index 2b1b1aa3..eac3f88d 100644
--- a/src/com/owncloud/android/lib/common/methods/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/PropfindMethod.java
@@ -6,6 +6,7 @@ import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.exception.UnauthorizedException;
 
 public class PropfindMethod extends DavMethod {
 
@@ -16,8 +17,12 @@ public class PropfindMethod extends DavMethod {
         mDepth = depth;
     };
 
-    public int execute() throws DavException, IOException, HttpException {
-        mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
+    public int execute() throws IOException, HttpException, DavException {
+        try {
+            mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
+        } catch (UnauthorizedException davException) {
+            return 401;
+        }
         return mDavResource.getResponse().code();
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 56722fe5..a8b14cde 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -206,7 +206,6 @@ public class RemoteOperationResult implements Serializable {
         } else {
             mCode = ResultCode.UNKNOWN_ERROR;
         }
-
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 40ebba29..dc812c50 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -76,14 +76,13 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 
         try {
 
-            final HttpUrl location = HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
+            final HttpUrl location = HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath));
             DavOCResource davOCResource = new DavOCResource(client.getOkHttpClient(), location);
             PropfindMethod propfindMethod = new PropfindMethod(davOCResource, 1);
 
             int status = client.executeHttpMethod(propfindMethod);
 
             // TODO Refactor from here down
-
             // remote request
 //            query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
 //                WebdavUtils.getAllPropSet(),    // PropFind Properties
@@ -113,8 +112,6 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
-
-
         } finally {
             if (query != null)
                 query.releaseConnection();  // let the connection available for other methods
@@ -150,14 +147,14 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 
         // parse data from remote folder 
         WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0],
-            client.getWebdavUri().getPath());
+            client.getNewWebDavUri().getPath());
         mFolderAndFiles.add(fillOCFile(we));
 
         // loop to update every child
         RemoteFile remoteFile = null;
         for (int i = 1; i < remoteData.getResponses().length; ++i) {
             /// new OCFile instance with the data from the server
-            we = new WebdavEntry(remoteData.getResponses()[i], client.getWebdavUri().getPath());
+            we = new WebdavEntry(remoteData.getResponses()[i], client.getNewWebDavUri().getPath());
             remoteFile = fillOCFile(we);
             mFolderAndFiles.add(remoteFile);
         }

From 81aa417cbfebf80df860573df151cea49b3aa352 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 4 Jun 2018 15:31:57 +0200
Subject: [PATCH 029/133] Custom interceptors to include user agent and
 authorization

---
 .../android/lib/common/OwnCloudClient.java    | 35 ++++---
 .../OwnCloudBasicCredentials.java             | 26 +++--
 .../interceptors/BasicAuthInterceptor.java    | 42 +++++++++
 .../common/interceptors/HttpInterceptor.java  | 94 +++++++++++++++++++
 .../interceptors/UserAgentInterceptor.java    | 42 +++++++++
 5 files changed, 217 insertions(+), 22 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java
 create mode 100644 src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
 create mode 100644 src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 10e46fd5..a0ab0855 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2017 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -33,6 +33,8 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
+import com.owncloud.android.lib.common.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.interceptors.UserAgentInterceptor;
 import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -71,7 +73,6 @@ public class OwnCloudClient extends HttpClient {
     private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
-    private static final String USER_AGENT_HEADER = "User-Agent";
 
     private static byte[] sExhaustBuffer = new byte[1024];
 
@@ -104,6 +105,7 @@ public class OwnCloudClient extends HttpClient {
     private String mRedirectedLocation;
 
     private static OkHttpClient mOkHttpClient = null;
+    private static HttpInterceptor mOkHttpInterceptor = null;
 
     /**
      * Constructor
@@ -143,18 +145,9 @@ public class OwnCloudClient extends HttpClient {
 
         super(connectionMgr);
 
-        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
-
         if (mOkHttpClient == null) {
             mOkHttpClient = new OkHttpClient.Builder()
-                    .addInterceptor(chain ->
-                            chain.proceed(
-                                    chain.request()
-                                            .newBuilder()
-                                            .addHeader(USER_AGENT_HEADER, userAgent)
-                                            .build()
-                            )
-                    )
+                    .addInterceptor(getBaseOkHttpInterceptor())
                     .protocols(Arrays.asList(Protocol.HTTP_1_1))
                     .followRedirects(false)
                     .build();
@@ -180,6 +173,24 @@ public class OwnCloudClient extends HttpClient {
         clearCredentials();
     }
 
+    /**
+     * {@link HttpInterceptor} singleton
+     * @return {@link HttpInterceptor} instance with user agent
+     */
+    public HttpInterceptor getBaseOkHttpInterceptor() {
+
+        if (mOkHttpInterceptor == null) {
+            mOkHttpInterceptor = new HttpInterceptor().
+                    addRequestInterceptor(
+                            new UserAgentInterceptor(
+                                    OwnCloudClientManagerFactory.getUserAgent()
+                            )
+                    );
+        }
+
+        return mOkHttpInterceptor;
+    }
+
     private void applyProxySettings() {
         String proxyHost = System.getProperty("http.proxyHost");
         String proxyPortSt = System.getProperty("http.proxyPort");
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 2e851762..0b7a6a7e 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,8 @@
 package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.interceptors.HttpInterceptor;
 
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;
@@ -38,6 +40,8 @@ import okhttp3.Credentials;
 
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
+    private static final String TAG = OwnCloudCredentials.class.getSimpleName();
+
     private String mUsername;
     private String mPassword;
     private boolean mAuthenticationPreemptive;
@@ -61,15 +65,17 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         List<String> authPrefs = new ArrayList<>(1);
         authPrefs.add(AuthPolicy.BASIC);
 
-        client.getOkHttpClient().newBuilder()
-                .addInterceptor(chain ->
-                        chain.proceed(
-                                chain.request()
-                                        .newBuilder()
-                                        .addHeader("Authorization", Credentials.basic(mUsername, mPassword))
-                                        .build()
-                        )
-                ).build();
+        for (HttpInterceptor.RequestInterceptor requestInterceptor :
+                client.getBaseOkHttpInterceptor().getRequestInterceptors()) {
+            if (requestInterceptor instanceof BasicAuthInterceptor) {
+                return;
+            }
+        }
+
+        client.getBaseOkHttpInterceptor()
+                .addRequestInterceptor(
+                        new BasicAuthInterceptor(Credentials.basic(mUsername, mPassword))
+                );
 
         //TODO
         client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
diff --git a/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java b/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java
new file mode 100644
index 00000000..152b7c20
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java
@@ -0,0 +1,42 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.interceptors;
+
+import okhttp3.Request;
+
+public class BasicAuthInterceptor implements HttpInterceptor.RequestInterceptor {
+
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+    private String mCredentials;
+
+    public BasicAuthInterceptor(String credentials) {
+        mCredentials = credentials;
+    }
+
+    @Override
+    public Request intercept(Request request) {
+        return request.newBuilder().addHeader(AUTHORIZATION_HEADER, mCredentials).build();
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java b/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
new file mode 100644
index 00000000..acb8336e
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
@@ -0,0 +1,94 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.interceptors;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * Http interceptor to use multiple interceptors in the same {@link okhttp3.OkHttpClient} instance
+ * @author David González Verdugo
+ */
+public class HttpInterceptor implements Interceptor {
+
+    private final ArrayList<RequestInterceptor> mRequestInterceptors = new ArrayList<>();
+    private final ArrayList<ResponseInterceptor> mResponseInterceptors = new ArrayList<>();
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+
+        for (RequestInterceptor interceptor : mRequestInterceptors) {
+            request = interceptor.intercept(request);
+        }
+
+        Response response = chain.proceed(request);
+
+        for (ResponseInterceptor interceptor : mResponseInterceptors) {
+            response = interceptor.intercept(response);
+        }
+
+        return response;
+    }
+
+    public interface RequestInterceptor {
+        Request intercept(Request request) throws IOException;
+    }
+
+    public interface ResponseInterceptor {
+        Response intercept(Response response) throws IOException;
+    }
+
+    public HttpInterceptor addRequestInterceptor (RequestInterceptor requestInterceptor) {
+        mRequestInterceptors.add(requestInterceptor);
+        return this;
+    }
+
+    public HttpInterceptor addResponseInterceptor (ResponseInterceptor responseInterceptor) {
+        mResponseInterceptors.add(responseInterceptor);
+        return this;
+    }
+
+    public ArrayList<RequestInterceptor> getRequestInterceptors() {
+        return mRequestInterceptors;
+    }
+
+    public ArrayList<ResponseInterceptor> getResponseInterceptors() {
+        return mResponseInterceptors;
+    }
+
+    public boolean requestWithCredentials () {
+        for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
+            if (requestInterceptor instanceof BasicAuthInterceptor) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java b/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java
new file mode 100644
index 00000000..bd46fc0f
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java
@@ -0,0 +1,42 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.interceptors;
+
+import okhttp3.Request;
+
+public class UserAgentInterceptor implements HttpInterceptor.RequestInterceptor {
+
+    private static final String USER_AGENT_HEADER = "User-Agent";
+    private String mUserAgent;
+
+    public UserAgentInterceptor(String userAgent) {
+        mUserAgent = userAgent;
+    }
+
+    @Override
+    public Request intercept(Request request) {
+        return request.newBuilder().addHeader(USER_AGENT_HEADER, mUserAgent).build();
+    }
+}
\ No newline at end of file

From 4f0cd82a7d2fc045538e4c371dffd372217f8d00 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 5 Jun 2018 10:40:23 +0200
Subject: [PATCH 030/133] Clear basic credentials before applying new ones

---
 .../authentication/OwnCloudBasicCredentials.java     | 12 +++++++-----
 .../lib/common/interceptors/HttpInterceptor.java     |  9 ---------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 0b7a6a7e..6650219d 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -25,7 +25,7 @@ package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.interceptors.HttpInterceptor.RequestInterceptor;
 
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;
@@ -65,10 +65,12 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         List<String> authPrefs = new ArrayList<>(1);
         authPrefs.add(AuthPolicy.BASIC);
 
-        for (HttpInterceptor.RequestInterceptor requestInterceptor :
-                client.getBaseOkHttpInterceptor().getRequestInterceptors()) {
+        ArrayList<RequestInterceptor> requestInterceptors = client.getBaseOkHttpInterceptor().getRequestInterceptors();
+
+        // Clear previous basic credentials
+        for (RequestInterceptor requestInterceptor : requestInterceptors) {
             if (requestInterceptor instanceof BasicAuthInterceptor) {
-                return;
+                requestInterceptors.remove(requestInterceptor);
             }
         }
 
@@ -77,7 +79,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
                         new BasicAuthInterceptor(Credentials.basic(mUsername, mPassword))
                 );
 
-        //TODO
+        //TODO Update from here down
         client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
         client.getParams().setAuthenticationPreemptive(mAuthenticationPreemptive);
         client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
diff --git a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java b/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
index acb8336e..560fe86a 100644
--- a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
+++ b/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
@@ -82,13 +82,4 @@ public class HttpInterceptor implements Interceptor {
     public ArrayList<ResponseInterceptor> getResponseInterceptors() {
         return mResponseInterceptors;
     }
-
-    public boolean requestWithCredentials () {
-        for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
-            if (requestInterceptor instanceof BasicAuthInterceptor) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

From dfab453e6bde71a6b6d303bf86ca5af9e32656f8 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 5 Jun 2018 16:28:28 +0200
Subject: [PATCH 031/133] Working on authentication operations

---
 .../android/lib/common/OwnCloudClient.java    |  17 +-
 .../common/methods/nonwebdav/GetMethod.java   |  26 +++
 .../common/methods/nonwebdav/HttpMethod.java  |  16 ++
 .../methods/{ => webdav}/DavMethod.java       |   4 +-
 .../methods/{ => webdav}/PropfindMethod.java  |   2 +-
 .../operations/RemoteOperationResult.java     | 158 +++++++++++++----
 .../files/ExistenceCheckRemoteOperation.java  |  68 ++++----
 .../files/ReadRemoteFolderOperation.java      | 160 ++++++------------
 .../lib/resources/files/RemoteFile.java       |  11 +-
 9 files changed, 284 insertions(+), 178 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
 create mode 100644 src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
 rename src/com/owncloud/android/lib/common/methods/{ => webdav}/DavMethod.java (66%)
 rename src/com/owncloud/android/lib/common/methods/{ => webdav}/PropfindMethod.java (93%)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index a0ab0855..41d34bdf 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -77,7 +77,6 @@ public class OwnCloudClient extends HttpClient {
     private static byte[] sExhaustBuffer = new byte[1024];
 
     private static int sIntanceCounter = 0;
-    private boolean mFollowRedirects = true;
     private OwnCloudCredentials mCredentials = null;
     private int mInstanceNumber = 0;
 
@@ -292,7 +291,7 @@ public class OwnCloudClient extends HttpClient {
 
             checkFirstRedirection(method);
 
-            if (mFollowRedirects) {
+            if (mOkHttpClient.followRedirects()) {
                 status = followRedirection(method).getLastStatus();
             }
 
@@ -312,7 +311,7 @@ public class OwnCloudClient extends HttpClient {
 
     public int executeHttpMethod (HttpBaseMethod method) throws Exception {
 
-        boolean repeatWithFreshCredentials = false;
+        boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
         int status;
 
@@ -457,7 +456,9 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public Uri getNewWebDavUri() {
-        return Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0 + mCredentials.getUsername());
+        return !(mCredentials instanceof OwnCloudAnonymousCredentials)
+                ? Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0)
+                : Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0 + mCredentials.getUsername());
     }
 
     /**
@@ -483,11 +484,15 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public void setFollowRedirects(boolean followRedirects) {
-        mFollowRedirects = followRedirects;
+        mOkHttpClient
+                .newBuilder()
+                .followRedirects(followRedirects)
+                .followSslRedirects(followRedirects)
+                .build();
     }
 
     public boolean getFollowRedirects() {
-        return mFollowRedirects;
+        return mOkHttpClient.followRedirects();
     }
 
     private void logCookiesAtRequest(Header[] headers, String when) {
diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
new file mode 100644
index 00000000..21dd6911
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
@@ -0,0 +1,26 @@
+package com.owncloud.android.lib.common.methods.nonwebdav;
+
+import java.io.IOException;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class GetMethod extends HttpMethod {
+
+    public GetMethod(OkHttpClient okHttpClient, String url) {
+        super(okHttpClient, url);
+    }
+
+    @Override
+    public int execute() throws IOException {
+        final Request request =
+                new Request.Builder()
+                .url(mUrl)
+                .get()
+                .build();
+
+        Response response = mOkHttpClient.newCall(request).execute();
+        return response.code();
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
new file mode 100644
index 00000000..3a70e6a9
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
@@ -0,0 +1,16 @@
+package com.owncloud.android.lib.common.methods.nonwebdav;
+
+import com.owncloud.android.lib.common.methods.HttpBaseMethod;
+
+import okhttp3.OkHttpClient;
+
+public abstract class HttpMethod implements HttpBaseMethod {
+
+    protected OkHttpClient mOkHttpClient;
+    protected String mUrl;
+
+    public HttpMethod (OkHttpClient okHttpClient, String url) {
+        mOkHttpClient = okHttpClient;
+        mUrl = url;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/DavMethod.java b/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
similarity index 66%
rename from src/com/owncloud/android/lib/common/methods/DavMethod.java
rename to src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
index e7a092e6..5c95f441 100644
--- a/src/com/owncloud/android/lib/common/methods/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
@@ -1,4 +1,6 @@
-package com.owncloud.android.lib.common.methods;
+package com.owncloud.android.lib.common.methods.webdav;
+
+import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 
 import at.bitfire.dav4android.DavResource;
 
diff --git a/src/com/owncloud/android/lib/common/methods/PropfindMethod.java b/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
similarity index 93%
rename from src/com/owncloud/android/lib/common/methods/PropfindMethod.java
rename to src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
index eac3f88d..36a7bb2f 100644
--- a/src/com/owncloud/android/lib/common/methods/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
@@ -1,4 +1,4 @@
-package com.owncloud.android.lib.common.methods;
+package com.owncloud.android.lib.common.methods.webdav;
 
 import java.io.IOException;
 
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index a8b14cde..14850acf 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -24,6 +24,20 @@
 
 package com.owncloud.android.lib.common.operations;
 
+import android.accounts.Account;
+import android.accounts.AccountsException;
+
+import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.network.CertificateCombinedException;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.ConnectTimeoutException;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.jackrabbit.webdav.DavException;
+import org.json.JSONException;
+
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -34,24 +48,15 @@ import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-
-import android.accounts.Account;
-import android.accounts.AccountsException;
-
-import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.lib.common.network.CertificateCombinedException;
-import com.owncloud.android.lib.common.utils.Log_OC;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavException;
-import org.json.JSONException;
+import java.util.List;
+import java.util.Map;
 
 import javax.net.ssl.SSLException;
 
+import okhttp3.Headers;
+import okhttp3.Request;
+import okhttp3.Response;
+
 
 /**
  * The result of a remote operation required to an ownCloud server.
@@ -222,12 +227,12 @@ public class RemoteOperationResult implements Serializable {
      *                   result.
      */
     public RemoteOperationResult(boolean success, HttpMethod httpMethod) throws IOException {
-        this(
-                success,
-                httpMethod.getStatusCode(),
-                httpMethod.getStatusText(),
-                httpMethod.getResponseHeaders()
-        );
+//        this(
+//                success,
+//                httpMethod.getStatusCode(),
+//                httpMethod.getStatusText(),
+//                httpMethod.getResponseHeaders()
+//        );
 
         if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
 
@@ -265,6 +270,63 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
+    /**
+     * Public constructor from separate elements of an HTTP or DAV response.
+     *
+     * To be used when the result needs to be interpreted from the response of an HTTP/DAV method.
+     *
+     * Determines a {@link ResultCode} from the already executed method received as a parameter. Generally,
+     * will depend on the HTTP code and HTTP response headers received. In some cases will inspect also the
+     * response body
+     *
+     * @param success
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    public RemoteOperationResult(boolean success, Request request, Response response) throws IOException {
+        this(success, response.code(), HttpStatus.getStatusText(response.code()), response.headers());
+
+        // TODO success parameter might not be needed
+        if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
+
+            String bodyResponse = response.body().string();
+            // do not get for other HTTP codes!; could not be available
+
+            if (bodyResponse != null && bodyResponse.length() > 0) {
+                InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
+                InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
+                try {
+                    if (xmlParser.parseXMLResponse(is)) {
+                        mCode = ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER;
+                    }
+
+                } catch (Exception e) {
+                    Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
+                    // mCode stays as set in this(success, httpCode, headers)
+                }
+            }
+        }
+
+        // before
+        switch (mHttpCode) {
+            case HttpStatus.SC_FORBIDDEN:
+                // TODO
+//                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_FORBIDDEN);
+                break;
+            case HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE:
+                // TODO
+//                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE);
+                break;
+            case HttpStatus.SC_SERVICE_UNAVAILABLE:
+                // TODO
+//                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_SERVICE_UNAVAILABLE);
+                break;
+            default:
+                break;
+        }
+    }
+
     /**
      * Parse the error message included in the body response, if any, and set the specific result
      * code
@@ -308,25 +370,61 @@ public class RemoteOperationResult implements Serializable {
      * @param success     The operation was considered successful or not.
      * @param httpCode    HTTP status code returned by an HTTP/DAV method.
      * @param httpPhrase  HTTP status line phrase returned by an HTTP/DAV method
-     * @param httpHeaders HTTP response header returned by an HTTP/DAV method
+     * @param headers HTTP response header returned by an HTTP/DAV method
      */
-    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Header[] httpHeaders) {
+    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Headers headers) {
         this(success, httpCode, httpPhrase);
-        if (httpHeaders != null) {
-            for (Header httpHeader : httpHeaders) {
-                if ("location".equals(httpHeader.getName().toLowerCase())) {
-                    mRedirectedLocation = httpHeader.getValue();
+        if (headers != null) {
+            for (Map.Entry<String, List<String>> header : headers.toMultimap().entrySet()) {
+                if ("location".equals(header.getKey().toLowerCase())) {
+                    mRedirectedLocation = header.getValue().get(0);
                     continue;
                 }
-                if ("www-authenticate".equals(httpHeader.getName().toLowerCase())) {
-                    mAuthenticate.add(httpHeader.getValue().toLowerCase());
+                if ("www-authenticate".equals(header.getKey().toLowerCase())) {
+                    mAuthenticate.add(header.getValue().get(0).toLowerCase());
                 }
             }
         }
         if (isIdPRedirection()) {
-            mCode = ResultCode.UNAUTHORIZED;    // overrides default ResultCode.UNKNOWN
+            // overrides default ResultCode.UNKNOWN
+            mCode = com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.UNAUTHORIZED;
         }
     }
+//
+//    /**
+//     * Public constructor from separate elements of an HTTP or DAV response.
+//     *
+//     * To be used when the result needs to be interpreted from HTTP response elements that could come from
+//     * different requests (WARNING: black magic, try to avoid).
+//     *
+//     * If all the fields come from the same HTTP/DAV response, {@link #RemoteOperationResult(boolean, HttpMethod)}
+//     * should be used instead.
+//     *
+//     * Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
+//     *
+//     * @param success     The operation was considered successful or not.
+//     * @param httpCode    HTTP status code returned by an HTTP/DAV method.
+//     * @param httpPhrase  HTTP status line phrase returned by an HTTP/DAV method
+//     * @param httpHeaders HTTP response header returned by an HTTP/DAV method
+//     */
+//    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Header[] httpHeaders) {
+//        this(success, httpCode, httpPhrase);
+//        if (httpHeaders != null) {
+//            for (Header httpHeader : httpHeaders) {
+//                if ("location".equals(httpHeader.getName().toLowerCase())) {
+//                    mRedirectedLocation = httpHeader.getValue();
+//                    continue;
+//                }
+//                if ("www-authenticate".equals(httpHeader.getName().toLowerCase())) {
+//                    mAuthenticate.add(httpHeader.getValue().toLowerCase());
+//                }
+//            }
+//        }
+//        if (isIdPRedirection()) {
+//            // overrides default ResultCode.UNKNOWN
+//            mCode = ResultCode.UNAUTHORIZED;    // overrides default ResultCode.UNKNOWN
+//        }
+//    }
 
     /**
      * Private constructor for results built interpreting a HTTP or DAV response.
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 63a95c3a..acf436bd 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -25,18 +25,20 @@
 package com.owncloud.android.lib.resources.files;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavConstants;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
-
-import android.content.Context;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import at.bitfire.dav4android.DavOCResource;
+import okhttp3.HttpUrl;
+
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * Operation to check the existence or absence of a path in a remote server.
  * 
@@ -57,8 +59,6 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
     /** Sequence of redirections followed. Available only after executing the operation */
     private RedirectionPath mRedirectionPath = null;
-        // TODO move to {@link RemoteOperation}, that needs a nice refactoring
-
     /**
      * Full constructor. Success of the operation will depend upon the value of successIfAbsent.
      *
@@ -73,38 +73,50 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
     @Override
 	protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        PropFindMethod propfind = null;
-        boolean previousFollowRedirects = client.getFollowRedirects();
+        RemoteOperationResult result;
+
+        // TODO Complete redirection stuff, although OkHttp should follow redirections by default
+//        boolean previousFollowRedirects = client.getFollowRedirects();
+
         try {
-            propfind = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mPath),
-                    WebdavUtils.getAllPropSet(), DavConstants.DEPTH_0);
-            client.setFollowRedirects(false);
-            int status = client.executeMethod(propfind, TIMEOUT, TIMEOUT);
-            if (previousFollowRedirects) {
-                mRedirectionPath = client.followRedirection(propfind);
-                status = mRedirectionPath.getLastStatus();
-            }
-            if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
-                client.exhaustResponse(propfind.getResponseBodyAsStream());
-            }
+
+            DavOCResource davOCResource = new DavOCResource(
+                    client.getOkHttpClient(),
+                    HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath))
+            );
+
+//            client.setFollowRedirects(false);
+
+            PropfindMethod propfindMethod = new PropfindMethod(davOCResource, 0);
+            int status = client.executeHttpMethod(propfindMethod);
+
+//            if (previousFollowRedirects) {
+//                mRedirectionPath = client.followRedirection(propfind);
+//                status = mRedirectionPath.getLastStatus();
+//            }
+//            if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
+//                client.exhaustResponse(propfind.getResponseBodyAsStream());
+//            }
+
             /**
              *  PROPFIND method
              *  404 NOT FOUND: path doesn't exist,
              *  207 MULTI_STATUS: path exists.
              */
-            boolean success = ((status == HttpStatus.SC_OK || status == HttpStatus.SC_MULTI_STATUS) &&
+            boolean isSuccess = ((status == HttpStatus.SC_OK || status == HttpStatus.SC_MULTI_STATUS) &&
                     !mSuccessIfAbsent) ||
                     (status == HttpStatus.SC_MULTI_STATUS && !mSuccessIfAbsent) ||
                     (status == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent);
-            result = new RemoteOperationResult(
-                success,
-                propfind
-            );
+
+            result = isSuccess
+                    ? new RemoteOperationResult(OK)
+                    : new RemoteOperationResult(false, davOCResource.getRequest(), davOCResource.getResponse());
+
+
             Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
-                    "finished with HTTP status " + status + (!success?"(FAIL)":""));
+                    "finished with HTTP status " + status + (!isSuccess?"(FAIL)":""));
             
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
@@ -114,9 +126,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     result.getLogMessage(), result.getException());
             
         } finally {
-            if (propfind != null)
-                propfind.releaseConnection();
-            client.setFollowRedirects(previousFollowRedirects);
+//            client.setFollowRedirects(previousFollowRedirects);
         }
         return result;
 	}
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index dc812c50..f5fa941e 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -1,22 +1,22 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -25,27 +25,27 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.methods.PropfindMethod;
-import com.owncloud.android.lib.common.network.WebdavEntry;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
-
 import java.util.ArrayList;
 
-import at.bitfire.dav4android.DavOCResource;
+import at.bitfire.dav4android.DavResource;
 import okhttp3.HttpUrl;
+import okhttp3.Response;
+
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
  * Remote operation performing the read of remote file or folder in the ownCloud server.
  *
  * @author David A. Velasco
  * @author masensio
+ * @author David González Verdugo
  */
 
 public class ReadRemoteFolderOperation extends RemoteOperation {
@@ -53,7 +53,6 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
     private static final String TAG = ReadRemoteFolderOperation.class.getSimpleName();
 
     private String mRemotePath;
-    private ArrayList<Object> mFolderAndFiles;
 
     /**
      * Constructor
@@ -72,55 +71,57 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
-        PropFindMethod query = null;
 
         try {
 
-            final HttpUrl location = HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath));
-            DavOCResource davOCResource = new DavOCResource(client.getOkHttpClient(), location);
-            PropfindMethod propfindMethod = new PropfindMethod(davOCResource, 1);
+            PropfindMethod propfindMethod = new PropfindMethod(
+                    client.getOkHttpClient(),
+                    HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    1);
 
-            int status = client.executeHttpMethod(propfindMethod);
+            Response response = client.executeHttpMethod(propfindMethod);
 
-            // TODO Refactor from here down
-            // remote request
-//            query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
-//                WebdavUtils.getAllPropSet(),    // PropFind Properties
-//                DavConstants.DEPTH_1);
-//            int status = client.executeMethod(query);
-//
-//            // check and process response
-//            boolean isSuccess = (
-//                status == HttpStatus.SC_MULTI_STATUS ||
-//                    status == HttpStatus.SC_OK
-//            );
-//            if (isSuccess) {
-//                // get data from remote folder
-//                MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
-//                readData(dataInServer, client);
-//
-//                // Result of the operation
-//                result = new RemoteOperationResult(true, query);
-//                // Add data to the result
-//                if (result.isSuccess()) {
-//                    result.setData(mFolderAndFiles);
-//                }
-//            } else {
-//                // synchronization failed
-//                result = new RemoteOperationResult(false, query);
-//            }
+            boolean isSuccess = (response.code() == HttpConstants.HTTP_MULTI_STATUS
+                    || response.code() == HttpConstants.HTTP_OK);
+
+            if (isSuccess) {
+
+                ArrayList<Object> mFolderAndFiles = new ArrayList<>();
+
+                // parse data from remote folder
+                mFolderAndFiles.add(
+                        new RemoteFile(propfindMethod.getDavResource(), client.getAccount().getDisplayName())
+                );
+
+                // loop to update every child
+                for (DavResource resource : propfindMethod.getMembers()) {
+                    RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
+                    mFolderAndFiles.add(file);
+                }
+
+                // Result of the operation
+                result = new RemoteOperationResult(OK);
+                result.setData(mFolderAndFiles);
+
+            } else {
+
+                // synchronization failed
+                result = new RemoteOperationResult(
+                        false,
+                        propfindMethod.getRequest(),
+                        response
+                );
+            }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
         } finally {
-            if (query != null)
-                query.releaseConnection();  // let the connection available for other methods
             if (result.isSuccess()) {
                 Log_OC.i(TAG, "Synchronized " + mRemotePath + ": " + result.getLogMessage());
             } else {
                 if (result.isException()) {
                     Log_OC.e(TAG, "Synchronized " + mRemotePath + ": " + result.getLogMessage(),
-                        result.getException());
+                            result.getException());
                 } else {
                     Log_OC.e(TAG, "Synchronized " + mRemotePath + ": " + result.getLogMessage());
                 }
@@ -128,57 +129,4 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
         }
         return result;
     }
-
-    public boolean isMultiStatus(int status) {
-        return (status == HttpStatus.SC_MULTI_STATUS);
-    }
-
-    /**
-     * Read the data retrieved from the server about the contents of the target folder
-     *
-     * @param remoteData Full response got from the server with the data of the target
-     *                   folder and its direct children.
-     * @param client     Client instance to the remote server where the data were
-     *                   retrieved.
-     * @return
-     */
-    private void readData(MultiStatus remoteData, OwnCloudClient client) {
-        mFolderAndFiles = new ArrayList<Object>();
-
-        // parse data from remote folder 
-        WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0],
-            client.getNewWebDavUri().getPath());
-        mFolderAndFiles.add(fillOCFile(we));
-
-        // loop to update every child
-        RemoteFile remoteFile = null;
-        for (int i = 1; i < remoteData.getResponses().length; ++i) {
-            /// new OCFile instance with the data from the server
-            we = new WebdavEntry(remoteData.getResponses()[i], client.getNewWebDavUri().getPath());
-            remoteFile = fillOCFile(we);
-            mFolderAndFiles.add(remoteFile);
-        }
-    }
-
-    /**
-     * Creates and populates a new {@link RemoteFile} object with the data read from the server.
-     *
-     * @param we WebDAV entry read from the server for a WebDAV resource (remote file or folder).
-     * @return New OCFile instance representing the remote resource described by we.
-     */
-    private RemoteFile fillOCFile(WebdavEntry we) {
-        RemoteFile file = new RemoteFile(we.decodedPath());
-        file.setCreationTimestamp(we.createTimestamp());
-        file.setLength(we.contentLength());
-        file.setMimeType(we.contentType());
-        file.setModifiedTimestamp(we.modifiedTimestamp());
-        file.setEtag(we.etag());
-        file.setPermissions(we.permissions());
-        file.setRemoteId(we.remoteId());
-        file.setSize(we.size());
-        file.setQuotaUsedBytes(we.quotaUsedBytes());
-        file.setQuotaAvailableBytes(we.quotaAvailableBytes());
-        file.setPrivateLink(we.privateLink());
-        return file;
-    }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index ebfcb1a1..3dc988bb 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
@@ -173,7 +174,7 @@ public class RemoteFile implements Parcelable, Serializable {
 
     /**
      * Create new {@link RemoteFile} with given path.
-     * <p>
+     *
      * The path received must be URL-decoded. Path separator must be OCFile.PATH_SEPARATOR, and it must be the first character in 'path'.
      *
      * @param path The remote path of the file.
@@ -201,8 +202,8 @@ public class RemoteFile implements Parcelable, Serializable {
         this.setPrivateLink(webdavEntry.privateLink());
     }
 
-    public RemoteFile(final DavResource davResource, OCContext context) {
-        this(getRemotePathFromUrl(davResource.getLocation(), context));
+    public RemoteFile(final DavResource davResource, String displayName) {
+        this(getRemotePathFromUrl(davResource.getLocation(), displayName));
         final PropertyCollection properties = davResource.getProperties();
         this.setCreationTimestamp(properties.get(CreationDate.class) != null
                 ? Long.parseLong(properties.get(CreationDate.class).getCreationDate())
@@ -227,9 +228,9 @@ public class RemoteFile implements Parcelable, Serializable {
     }
 
 
-    private static String getRemotePathFromUrl(HttpUrl url, OCContext context) {
+    private static String getRemotePathFromUrl(HttpUrl url, String displayName) {
         final String pathToRemove =
-                "/" + RemoteOperation.WEBDAV_PATH_4_0 + "/" + context.getOCAccount().getDisplayName();
+                "/" + RemoteOperation.WEBDAV_PATH_4_0 + "/" + displayName;
         return Uri.decode(url.encodedPath()).replace(pathToRemove, "");
     }
 

From 1cf44a9fff8f3807a4361f0780fd45a2181e0d3b Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 5 Jun 2018 17:40:05 +0200
Subject: [PATCH 032/133] Code refactoring

---
 .../lib/common/methods/HttpBaseMethod.java    | 17 +++-
 .../common/methods/nonwebdav/GetMethod.java   | 13 ++-
 .../common/methods/nonwebdav/HttpMethod.java  |  9 +-
 .../lib/common/methods/webdav/DavMethod.java  |  9 +-
 .../common/methods/webdav/PropfindMethod.java | 33 ++++++--
 .../files/ExistenceCheckRemoteOperation.java  | 21 +++--
 .../users/GetRemoteUserInfoOperation.java     | 84 +++++++++++--------
 7 files changed, 117 insertions(+), 69 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
index c153d086..cac3c62c 100644
--- a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
@@ -1,5 +1,18 @@
 package com.owncloud.android.lib.common.methods;
 
-public interface HttpBaseMethod {
-    int execute() throws Exception;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public abstract class HttpBaseMethod {
+    public abstract int execute() throws Exception;
+    protected Request mRequest;
+    protected Response mResponse;
+
+    public Request getRequest() {
+        return mRequest;
+    }
+
+    public Response getResponse() {
+        return mResponse;
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
index 21dd6911..11fc49c8 100644
--- a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
@@ -8,19 +8,18 @@ import okhttp3.Response;
 
 public class GetMethod extends HttpMethod {
 
-    public GetMethod(OkHttpClient okHttpClient, String url) {
-        super(okHttpClient, url);
+    public GetMethod(OkHttpClient okHttpClient, Request requestBase) {
+        super(okHttpClient, requestBase);
     }
 
     @Override
     public int execute() throws IOException {
-        final Request request =
-                new Request.Builder()
-                .url(mUrl)
+        final Request request = mBaseRequest
+                .newBuilder()
                 .get()
                 .build();
 
-        Response response = mOkHttpClient.newCall(request).execute();
-        return response.code();
+        mResponse = mOkHttpClient.newCall(request).execute();
+        return mResponse.code();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
index 3a70e6a9..4c6f5e2c 100644
--- a/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
@@ -3,14 +3,15 @@ package com.owncloud.android.lib.common.methods.nonwebdav;
 import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
-public abstract class HttpMethod implements HttpBaseMethod {
+public abstract class HttpMethod extends HttpBaseMethod {
 
     protected OkHttpClient mOkHttpClient;
-    protected String mUrl;
+    protected Request mBaseRequest;
 
-    public HttpMethod (OkHttpClient okHttpClient, String url) {
+    public HttpMethod (OkHttpClient okHttpClient, Request baseRequest) {
         mOkHttpClient = okHttpClient;
-        mUrl = url;
+        mBaseRequest = baseRequest;
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
index 5c95f441..195222fc 100644
--- a/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
@@ -2,13 +2,16 @@ package com.owncloud.android.lib.common.methods.webdav;
 
 import com.owncloud.android.lib.common.methods.HttpBaseMethod;
 
+import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 
-public abstract class DavMethod implements HttpBaseMethod {
+public abstract class DavMethod extends HttpBaseMethod {
 
     protected DavResource mDavResource;
 
-    public DavMethod(DavResource davResource) {
-        mDavResource = davResource;
+    public DavMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
+        mDavResource = new DavOCResource(okHttpClient, httpUrl);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
index 36a7bb2f..a21cc494 100644
--- a/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
@@ -1,28 +1,51 @@
 package com.owncloud.android.lib.common.methods.webdav;
 
-import java.io.IOException;
+import com.owncloud.android.lib.common.network.WebdavUtils;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Set;
+
+import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 
 public class PropfindMethod extends DavMethod {
 
     private int mDepth;
+    private Set<DavResource> mMembers;
 
-    public PropfindMethod(DavResource davResource, int depth) {
-        super(davResource);
+    public PropfindMethod(OkHttpClient okHttpClient, HttpUrl httpUrl, int depth) {
+        super(okHttpClient, httpUrl);
         mDepth = depth;
     };
 
+    @Override
     public int execute() throws IOException, HttpException, DavException {
+
         try {
             mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
+            mMembers = mDavResource.getMembers();
         } catch (UnauthorizedException davException) {
-            return 401;
+            // Do nothing, we will use the 401 code to handle the situation
         }
-        return mDavResource.getResponse().code();
+
+        mRequest = mDavResource.getRequest();
+        mResponse = mDavResource.getResponse();
+
+        return mResponse.code();
+    }
+
+    public int getDepth() {
+        return mDepth;
+    }
+
+    public Set<DavResource> getMembers() {
+        return mMembers;
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index acf436bd..1dd82b22 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -24,8 +24,6 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import org.apache.commons.httpclient.HttpStatus;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
@@ -34,7 +32,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import at.bitfire.dav4android.DavOCResource;
+import org.apache.commons.httpclient.HttpStatus;
+
 import okhttp3.HttpUrl;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -80,14 +79,13 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
         try {
 
-            DavOCResource davOCResource = new DavOCResource(
-                    client.getOkHttpClient(),
-                    HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath))
-            );
-
 //            client.setFollowRedirects(false);
 
-            PropfindMethod propfindMethod = new PropfindMethod(davOCResource, 0);
+            PropfindMethod propfindMethod = new PropfindMethod(
+                    client.getOkHttpClient(),
+                    HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
+                    0);
+
             int status = client.executeHttpMethod(propfindMethod);
 
 //            if (previousFollowRedirects) {
@@ -110,8 +108,9 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
             result = isSuccess
                     ? new RemoteOperationResult(OK)
-                    : new RemoteOperationResult(false, davOCResource.getRequest(), davOCResource.getResponse());
-
+                    : new RemoteOperationResult(
+                            false, propfindMethod.getRequest(), propfindMethod.getResponse()
+            );
 
             Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index 12e0486b..3639d5fa 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -27,13 +27,15 @@ package com.owncloud.android.lib.resources.users;
 import java.util.ArrayList;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONObject;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.common.methods.nonwebdav.GetMethod;
+
+import okhttp3.Request;
 
 
 /**
@@ -63,53 +65,61 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
-        int status = -1;
-        GetMethod get = null;
 
         //Get the user
         try {
-            get = new GetMethod(client.getBaseUri() + OCS_ROUTE);
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-            status = client.executeMethod(get);
-            if (isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
-                Log_OC.d(TAG, "Successful response");
 
-                // Parse the response
-                JSONObject respJSON = new JSONObject(response);
-                JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
-                JSONObject respData = respOCS.getJSONObject(NODE_DATA);
+            final Request request = new Request.Builder()
+                    .url(client.getBaseUri() + OCS_ROUTE)
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-                UserInfo userInfo = new UserInfo();
-                userInfo.mId = respData.getString(NODE_ID);
-                userInfo.mDisplayName = respData.getString(NODE_DISPLAY_NAME);
-                userInfo.mEmail = respData.getString(NODE_EMAIL);
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
 
-                // Result
-                result = new RemoteOperationResult(true, get);
-                // Username in result.data
-                ArrayList<Object> data = new ArrayList<Object>();
-                data.add(userInfo);
-                result.setData(data);
-
-            } else {
-                result = new RemoteOperationResult(false, get);
-                String response = get.getResponseBodyAsString();
-                Log_OC.e(TAG, "Failed response while getting user information ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-                } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
-                }
-            }
+//            client.executeHttpMethod(getMethod);
+//
+//            get = new GetMethod(client.getBaseUri() + OCS_ROUTE);
+//            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+//            status = client.executeMethod(get);
+//            if (isSuccess(status)) {
+//                String response = get.getResponseBodyAsString();
+//                Log_OC.d(TAG, "Successful response");
+//
+//                // Parse the response
+//                JSONObject respJSON = new JSONObject(response);
+//                JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
+//                JSONObject respData = respOCS.getJSONObject(NODE_DATA);
+//
+//                UserInfo userInfo = new UserInfo();
+//                userInfo.mId = respData.getString(NODE_ID);
+//                userInfo.mDisplayName = respData.getString(NODE_DISPLAY_NAME);
+//                userInfo.mEmail = respData.getString(NODE_EMAIL);
+//
+//                // Result
+//                result = new RemoteOperationResult(true, get);
+//                // Username in result.data
+//                ArrayList<Object> data = new ArrayList<Object>();
+//                data.add(userInfo);
+//                result.setData(data);
+//
+//            } else {
+//                result = new RemoteOperationResult(false, get);
+//                String response = get.getResponseBodyAsString();
+//                Log_OC.e(TAG, "Failed response while getting user information ");
+//                if (response != null) {
+//                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
+//                } else {
+//                    Log_OC.e(TAG, "*** status code: " + status);
+//                }
+//            }
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting OC user information", e);
 
         } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
+//            if (get != null) {
+//                get.releaseConnection();
+//            }
         }
 
         return result;

From dc9a37db28dbe91b04416a94d858241768280c87 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 5 Jun 2018 18:22:54 +0200
Subject: [PATCH 033/133] Update GetMethod to be used in
 GetRemoteUserInfoOperation

---
 .../common/methods/nonwebdav/GetMethod.java   |  8 +-
 .../users/GetRemoteUserInfoOperation.java     | 79 ++++++++-----------
 2 files changed, 38 insertions(+), 49 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
index 11fc49c8..6a297764 100644
--- a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
@@ -8,18 +8,18 @@ import okhttp3.Response;
 
 public class GetMethod extends HttpMethod {
 
-    public GetMethod(OkHttpClient okHttpClient, Request requestBase) {
-        super(okHttpClient, requestBase);
+    public GetMethod(OkHttpClient okHttpClient, Request baseRequest) {
+        super(okHttpClient, baseRequest);
     }
 
     @Override
     public int execute() throws IOException {
-        final Request request = mBaseRequest
+        mRequest = mBaseRequest
                 .newBuilder()
                 .get()
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
+        mResponse = mOkHttpClient.newCall(mRequest).execute();
         return mResponse.code();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index 3639d5fa..987c29dc 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -37,12 +37,15 @@ import com.owncloud.android.lib.common.methods.nonwebdav.GetMethod;
 
 import okhttp3.Request;
 
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 
 /**
  * Gets information (id, display name, and e-mail address) about the user logged in.
  *
  * @author masensio
  * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class GetRemoteUserInfoOperation extends RemoteOperation {
@@ -64,62 +67,49 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
 
         //Get the user
         try {
-
             final Request request = new Request.Builder()
                     .url(client.getBaseUri() + OCS_ROUTE)
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 
             GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            int status = client.executeHttpMethod(getMethod);
+            String response = getMethod.getResponse().body().string();
 
-//            client.executeHttpMethod(getMethod);
-//
-//            get = new GetMethod(client.getBaseUri() + OCS_ROUTE);
-//            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-//            status = client.executeMethod(get);
-//            if (isSuccess(status)) {
-//                String response = get.getResponseBodyAsString();
-//                Log_OC.d(TAG, "Successful response");
-//
-//                // Parse the response
-//                JSONObject respJSON = new JSONObject(response);
-//                JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
-//                JSONObject respData = respOCS.getJSONObject(NODE_DATA);
-//
-//                UserInfo userInfo = new UserInfo();
-//                userInfo.mId = respData.getString(NODE_ID);
-//                userInfo.mDisplayName = respData.getString(NODE_DISPLAY_NAME);
-//                userInfo.mEmail = respData.getString(NODE_EMAIL);
-//
-//                // Result
-//                result = new RemoteOperationResult(true, get);
-//                // Username in result.data
-//                ArrayList<Object> data = new ArrayList<Object>();
-//                data.add(userInfo);
-//                result.setData(data);
-//
-//            } else {
-//                result = new RemoteOperationResult(false, get);
-//                String response = get.getResponseBodyAsString();
-//                Log_OC.e(TAG, "Failed response while getting user information ");
-//                if (response != null) {
-//                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-//                } else {
-//                    Log_OC.e(TAG, "*** status code: " + status);
-//                }
-//            }
+            if (isSuccess(status)) {
+                Log_OC.d(TAG, "Successful response");
+
+                JSONObject respJSON = new JSONObject(response);
+                JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
+                JSONObject respData = respOCS.getJSONObject(NODE_DATA);
+
+                UserInfo userInfo = new UserInfo();
+                userInfo.mId = respData.getString(NODE_ID);
+                userInfo.mDisplayName = respData.getString(NODE_DISPLAY_NAME);
+                userInfo.mEmail = respData.getString(NODE_EMAIL);
+
+                result = new RemoteOperationResult(OK);
+
+                ArrayList<Object> data = new ArrayList<>();
+                data.add(userInfo);
+                result.setData(data);
+
+            } else {
+                result = new RemoteOperationResult(false, getMethod.getRequest(), getMethod.getResponse());
+                Log_OC.e(TAG, "Failed response while getting user information ");
+                if (response != null) {
+                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
+                } else {
+                    Log_OC.e(TAG, "*** status code: " + status);
+                }
+            }
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting OC user information", e);
-
-        } finally {
-//            if (get != null) {
-//                get.releaseConnection();
-//            }
         }
 
         return result;
@@ -129,7 +119,6 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
         return (status == HttpStatus.SC_OK);
     }
 
-
     public static class UserInfo {
         public String mId = "";
         public String mDisplayName = "";

From e7c5391ac5c2bf88da2cca8244b46b334ef88465 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 5 Jun 2018 18:45:45 +0200
Subject: [PATCH 034/133] Fix new webdav uri build

---
 src/com/owncloud/android/lib/common/OwnCloudClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 41d34bdf..ece9f228 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -456,7 +456,7 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public Uri getNewWebDavUri() {
-        return !(mCredentials instanceof OwnCloudAnonymousCredentials)
+        return mCredentials instanceof OwnCloudAnonymousCredentials
                 ? Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0)
                 : Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0 + mCredentials.getUsername());
     }

From ac869690fca259c2a9b538326bd9c08187a04308 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 6 Jun 2018 10:00:28 +0200
Subject: [PATCH 035/133] change dav4droid repository to the ownclouders one

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index e6e5b2b2..c0c4fac3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "dav4android"]
 	path = dav4android
-	url = https://gitlab.com/derSchabi/dav4android.git
+	url = https://gitlab.com/ownclouders/dav4android.git

From bd825370452eb618ec8585a8ad81ec26d0aa5acf Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 11:24:00 +0200
Subject: [PATCH 036/133] Fix read remote folder

---
 .../owncloud/android/lib/common/methods/webdav/DavMethod.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
index 195222fc..09d87d5d 100644
--- a/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
@@ -14,4 +14,8 @@ public abstract class DavMethod extends HttpBaseMethod {
     public DavMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
         mDavResource = new DavOCResource(okHttpClient, httpUrl);
     }
+
+    public DavResource getDavResource() {
+        return mDavResource;
+    }
 }
\ No newline at end of file

From 25bba85ee1026c3801c0573f9c0a82ac713f2d7a Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 13:20:12 +0200
Subject: [PATCH 037/133] Implement get quota with new architecture and
 refactoring

---
 .../android/lib/common/OwnCloudClient.java    |   2 +-
 .../{methods => http}/HttpBaseMethod.java     |   2 +-
 .../lib/common/http/HttpConstants.java        | 126 ++++++++++++++++++
 .../nonwebdav/GetMethod.java                  |   3 +-
 .../nonwebdav/HttpMethod.java                 |   4 +-
 .../{methods => http}/webdav/DavMethod.java   |   4 +-
 .../webdav/PropfindMethod.java                |   6 +-
 .../files/ExistenceCheckRemoteOperation.java  |   2 +-
 .../users/GetRemoteUserInfoOperation.java     |   8 +-
 .../users/GetRemoteUserQuotaOperation.java    |   2 +-
 10 files changed, 139 insertions(+), 20 deletions(-)
 rename src/com/owncloud/android/lib/common/{methods => http}/HttpBaseMethod.java (87%)
 create mode 100644 src/com/owncloud/android/lib/common/http/HttpConstants.java
 rename src/com/owncloud/android/lib/common/{methods => http}/nonwebdav/GetMethod.java (86%)
 rename src/com/owncloud/android/lib/common/{methods => http}/nonwebdav/HttpMethod.java (74%)
 rename src/com/owncloud/android/lib/common/{methods => http}/webdav/DavMethod.java (79%)
 rename src/com/owncloud/android/lib/common/{methods => http}/webdav/PropfindMethod.java (87%)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index ece9f228..901261f9 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -35,7 +35,7 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
 import com.owncloud.android.lib.common.interceptors.HttpInterceptor;
 import com.owncloud.android.lib.common.interceptors.UserAgentInterceptor;
-import com.owncloud.android.lib.common.methods.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
diff --git a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
similarity index 87%
rename from src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
rename to src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index cac3c62c..224e5eba 100644
--- a/src/com/owncloud/android/lib/common/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -1,4 +1,4 @@
-package com.owncloud.android.lib.common.methods;
+package com.owncloud.android.lib.common.http;
 
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
new file mode 100644
index 00000000..b1235f86
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -0,0 +1,126 @@
+package com.owncloud.android.lib.common.http;
+
+public class HttpConstants {
+
+    /**
+     * 1xx Informational
+     */
+
+    // 100 Continue (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_CONTINUE = 100;
+    // 101 Switching Protocols (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_SWITCHING_PROTOCOLS = 101;
+    // 102 Processing (WebDAV - RFC 2518)
+    public static final int HTTP_PROCESSING = 102;
+
+    /**
+     * 2xx Success
+     */
+
+    // 200 OK (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_OK = 200;
+    // 201 Created (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_CREATED = 201;
+    // 202 Accepted (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_ACCEPTED = 202;
+    // 203 Non Authoritative Information (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
+    // 204 No Content</tt> (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_NO_CONTENT = 204;
+    // 205 Reset Content</tt> (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_RESET_CONTENT = 205;
+    // 206 Partial Content</tt> (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_PARTIAL_CONTENT = 206;
+    //207 Multi-Status (WebDAV - RFC 2518) or 207 Partial Update OK (HTTP/1.1 - draft-ietf-http-v11-spec-rev-01?)
+    public static final int HTTP_MULTI_STATUS = 207;
+
+    /**
+     * 3xx Redirection
+     */
+
+    // 300 Mutliple Choices</tt> (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_MULTIPLE_CHOICES = 300;
+    // 301 Moved Permanently</tt> (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_MOVED_PERMANENTLY = 301;
+    // 302 Moved Temporarily</tt> (Sometimes <tt>Found) (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_MOVED_TEMPORARILY = 302;
+    // 303 See Other (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_SEE_OTHER = 303;
+    // 304 Not Modified (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_NOT_MODIFIED = 304;
+    // 305 Use Proxy (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_USE_PROXY = 305;
+    // 307 Temporary Redirect (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_TEMPORARY_REDIRECT = 307;
+
+    /**
+     * 4xx Client Error
+     */
+
+    // 400 Bad Request (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_BAD_REQUEST = 400;
+    // 401 Unauthorized (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_UNAUTHORIZED = 401;
+    // 402 Payment Required (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_PAYMENT_REQUIRED = 402;
+    // 403 Forbidden (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_FORBIDDEN = 403;
+    // 404 Not Found (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_NOT_FOUND = 404;
+    // 405 Method Not Allowed (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_METHOD_NOT_ALLOWED = 405;
+    // 406 Not Acceptable (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_NOT_ACCEPTABLE = 406;
+    // 407 Proxy Authentication Required (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
+    // 408 Request Timeout (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_REQUEST_TIMEOUT = 408;
+    // 409 Conflict (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_CONFLICT = 409;
+    // 410 Gone (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_GONE = 410;
+    // 411 Length Required (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_LENGTH_REQUIRED = 411;
+    // 412 Precondition Failed (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_PRECONDITION_FAILED = 412;
+    // 413 Request Entity Too Large (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_REQUEST_TOO_LONG = 413;
+    // 414 Request-URI Too Long (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_REQUEST_URI_TOO_LONG = 414;
+    // 415 Unsupported Media Type (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
+    // 416 Requested Range Not Satisfiable (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+    // 417 Expectation Failed (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_EXPECTATION_FAILED = 417;
+    // 419 Insufficient Space on Resource (WebDAV - draft-ietf-webdav-protocol-05?)
+    // or <tt>419 Proxy Reauthentication Required (HTTP/1.1 drafts?)
+    public static final int HTTP_INSUFFICIENT_SPACE_ON_RESOURCE = 419;
+    // 420 Method Failure (WebDAV - draft-ietf-webdav-protocol-05?)
+    public static final int HTTP_METHOD_FAILURE = 420;
+    // 422 Unprocessable Entity (WebDAV - RFC 2518)
+    public static final int HTTP_UNPROCESSABLE_ENTITY = 422;
+    // 423 Locked (WebDAV - RFC 2518)
+    public static final int HTTP_LOCKED = 423;
+    // 424 Failed Dependency (WebDAV - RFC 2518)
+    public static final int HTTP_FAILED_DEPENDENCY = 424;
+
+    /**
+     * 5xx Client Error
+     */
+
+    // 500 Server Error (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_INTERNAL_SERVER_ERROR = 500;
+    // 501 Not Implemented (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_NOT_IMPLEMENTED = 501;
+    // 502 Bad Gateway (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_BAD_GATEWAY = 502;
+    // 503 Service Unavailable (HTTP/1.0 - RFC 1945)
+    public static final int HTTP_SERVICE_UNAVAILABLE = 503;
+    // 504 Gateway Timeout (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_GATEWAY_TIMEOUT = 504;
+    // 505 HTTP Version Not Supported (HTTP/1.1 - RFC 2616)
+    public static final int HTTP_HTTP_VERSION_NOT_SUPPORTED = 505;
+    // 507 Insufficient Storage (WebDAV - RFC 2518)
+    public static final int HTTP_INSUFFICIENT_STORAGE = 507;
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
similarity index 86%
rename from src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
rename to src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
index 6a297764..385582b6 100644
--- a/src/com/owncloud/android/lib/common/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
@@ -1,10 +1,9 @@
-package com.owncloud.android.lib.common.methods.nonwebdav;
+package com.owncloud.android.lib.common.http.nonwebdav;
 
 import java.io.IOException;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 public class GetMethod extends HttpMethod {
 
diff --git a/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
similarity index 74%
rename from src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
rename to src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
index 4c6f5e2c..79640bcf 100644
--- a/src/com/owncloud/android/lib/common/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
@@ -1,6 +1,6 @@
-package com.owncloud.android.lib.common.methods.nonwebdav;
+package com.owncloud.android.lib.common.http.nonwebdav;
 
-import com.owncloud.android.lib.common.methods.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.HttpBaseMethod;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
diff --git a/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
similarity index 79%
rename from src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
rename to src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
index 09d87d5d..ba142d4f 100644
--- a/src/com/owncloud/android/lib/common/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
@@ -1,6 +1,6 @@
-package com.owncloud.android.lib.common.methods.webdav;
+package com.owncloud.android.lib.common.http.webdav;
 
-import com.owncloud.android.lib.common.methods.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.HttpBaseMethod;
 
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
diff --git a/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
similarity index 87%
rename from src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
rename to src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
index a21cc494..c90401a8 100644
--- a/src/com/owncloud/android/lib/common/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
@@ -1,12 +1,8 @@
-package com.owncloud.android.lib.common.methods.webdav;
-
-import com.owncloud.android.lib.common.network.WebdavUtils;
+package com.owncloud.android.lib.common.http.webdav;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Set;
 
-import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
 import at.bitfire.dav4android.exception.DavException;
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 1dd82b22..8c905305 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -25,7 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.methods.webdav.PropfindMethod;
+import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index 987c29dc..f906a346 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -25,15 +25,13 @@
 package com.owncloud.android.lib.resources.users;
 
 import java.util.ArrayList;
-
-import org.apache.commons.httpclient.HttpStatus;
 import org.json.JSONObject;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.common.methods.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 
 import okhttp3.Request;
 
@@ -116,7 +114,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
 
     public static class UserInfo {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 2109efb4..0ae91a43 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -188,4 +188,4 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
             );
         }
     }
-}
+}
\ No newline at end of file

From 01d4592de06ed8dfbf587b1ff0d71df113a98294 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 13:53:14 +0200
Subject: [PATCH 038/133] Refactor httm methods to return response instead of
 response code

---
 .../android/lib/common/OwnCloudClient.java    | 11 ++++++-----
 .../lib/common/http/HttpBaseMethod.java       |  7 +------
 .../lib/common/http/nonwebdav/GetMethod.java  |  6 +++---
 .../common/http/webdav/PropfindMethod.java    |  8 +++-----
 .../files/ExistenceCheckRemoteOperation.java  | 19 ++++++++++---------
 .../users/GetRemoteUserInfoOperation.java     | 14 +++++++-------
 6 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 901261f9..6fe0dc9d 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -59,6 +59,7 @@ import java.util.Arrays;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
+import okhttp3.Response;
 
 public class OwnCloudClient extends HttpClient {
 
@@ -309,21 +310,21 @@ public class OwnCloudClient extends HttpClient {
         return status;
     }
 
-    public int executeHttpMethod (HttpBaseMethod method) throws Exception {
+    public Response executeHttpMethod (HttpBaseMethod method) throws Exception {
 
         boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
-        int status;
+        Response response;
 
         do {
-            status = method.execute();
-            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
+            response = method.execute();
+            repeatWithFreshCredentials = checkUnauthorizedAccess(response.code(), repeatCounter);
             if (repeatWithFreshCredentials) {
                 repeatCounter++;
             }
         } while (repeatWithFreshCredentials);
 
-        return status;
+        return response;
     }
 
     private void checkFirstRedirection(HttpMethod method) {
diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index 224e5eba..8a73c16b 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -4,15 +4,10 @@ import okhttp3.Request;
 import okhttp3.Response;
 
 public abstract class HttpBaseMethod {
-    public abstract int execute() throws Exception;
+    public abstract Response execute() throws Exception;
     protected Request mRequest;
-    protected Response mResponse;
 
     public Request getRequest() {
         return mRequest;
     }
-
-    public Response getResponse() {
-        return mResponse;
-    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
index 385582b6..6015e474 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Response;
 
 public class GetMethod extends HttpMethod {
 
@@ -12,13 +13,12 @@ public class GetMethod extends HttpMethod {
     }
 
     @Override
-    public int execute() throws IOException {
+    public Response execute() throws IOException {
         mRequest = mBaseRequest
                 .newBuilder()
                 .get()
                 .build();
 
-        mResponse = mOkHttpClient.newCall(mRequest).execute();
-        return mResponse.code();
+        return mOkHttpClient.newCall(mRequest).execute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
index c90401a8..8fb66819 100644
--- a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
@@ -10,6 +10,7 @@ import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
+import okhttp3.Response;
 
 public class PropfindMethod extends DavMethod {
 
@@ -22,8 +23,7 @@ public class PropfindMethod extends DavMethod {
     };
 
     @Override
-    public int execute() throws IOException, HttpException, DavException {
-
+    public Response execute() throws IOException, HttpException, DavException {
         try {
             mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
             mMembers = mDavResource.getMembers();
@@ -32,9 +32,7 @@ public class PropfindMethod extends DavMethod {
         }
 
         mRequest = mDavResource.getRequest();
-        mResponse = mDavResource.getResponse();
-
-        return mResponse.code();
+        return mDavResource.getResponse();
     }
 
     public int getDepth() {
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 8c905305..7516febb 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -35,6 +35,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.apache.commons.httpclient.HttpStatus;
 
 import okhttp3.HttpUrl;
+import okhttp3.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -86,7 +87,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0);
 
-            int status = client.executeHttpMethod(propfindMethod);
+            Response response = client.executeHttpMethod(propfindMethod);
 
 //            if (previousFollowRedirects) {
 //                mRedirectionPath = client.followRedirection(propfind);
@@ -101,21 +102,22 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
              *  404 NOT FOUND: path doesn't exist,
              *  207 MULTI_STATUS: path exists.
              */
-            boolean isSuccess = ((status == HttpStatus.SC_OK || status == HttpStatus.SC_MULTI_STATUS) &&
-                    !mSuccessIfAbsent) ||
-                    (status == HttpStatus.SC_MULTI_STATUS && !mSuccessIfAbsent) ||
-                    (status == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent);
+            boolean isSuccess = ((response.code() == HttpStatus.SC_OK
+                    || response.code() == HttpStatus.SC_MULTI_STATUS)
+                    && !mSuccessIfAbsent)
+                    || (response.code() == HttpStatus.SC_MULTI_STATUS && !mSuccessIfAbsent)
+                    || (response.code() == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent);
 
             result = isSuccess
                     ? new RemoteOperationResult(OK)
                     : new RemoteOperationResult(
-                            false, propfindMethod.getRequest(), propfindMethod.getResponse()
+                            false, propfindMethod.getRequest(), response
             );
 
             Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
-                    "finished with HTTP status " + status + (!isSuccess?"(FAIL)":""));
+                    "finished with HTTP status " + response.code() + (!isSuccess?"(FAIL)":""));
             
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
@@ -130,7 +132,6 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
         return result;
 	}
 
-
     /**
      * Gets the sequence of redirections followed during the execution of the operation.
      *
@@ -146,4 +147,4 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
     public boolean wasRedirected() {
         return (mRedirectionPath != null && mRedirectionPath.getRedirectionsCount() > 0);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index f906a346..25a8da92 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -34,6 +34,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 
 import okhttp3.Request;
+import okhttp3.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -75,13 +76,12 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                     .build();
 
             GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
-            int status = client.executeHttpMethod(getMethod);
-            String response = getMethod.getResponse().body().string();
+            Response response = client.executeHttpMethod(getMethod);
 
-            if (isSuccess(status)) {
+            if (isSuccess(response.code())) {
                 Log_OC.d(TAG, "Successful response");
 
-                JSONObject respJSON = new JSONObject(response);
+                JSONObject respJSON = new JSONObject(response.body().string());
                 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
                 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
 
@@ -97,12 +97,12 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                 result.setData(data);
 
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), getMethod.getResponse());
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
                 Log_OC.e(TAG, "Failed response while getting user information ");
                 if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
+                    Log_OC.e(TAG, "*** status code: " + response.code() + " ; response message: " + response);
                 } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
+                    Log_OC.e(TAG, "*** status code: " + response.code());
                 }
             }
         } catch (Exception e) {

From a730980c34c0173428c0af743e7b640a9b3abbb1 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 16:55:12 +0200
Subject: [PATCH 039/133] Implement GetRemoteStatusOperation using new wrapper

---
 .../status/GetRemoteStatusOperation.java      | 86 ++++++++++---------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index a4f32168..a76fbb89 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,9 @@ package com.owncloud.android.lib.resources.status;
 import java.util.ArrayList;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
+
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
 import org.json.JSONException;
@@ -44,11 +46,17 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import okhttp3.Request;
+import okhttp3.Response;
+
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * Checks if the server is valid and if the server supports the Share API
  *
  * @author David A. Velasco
  * @author masensio
+ * @author David González Verdugo
  */
 
 public class GetRemoteStatusOperation extends RemoteOperation {
@@ -75,47 +83,52 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 
     private boolean tryConnection(OwnCloudClient client) {
         boolean retval = false;
-        GetMethod get = null;
         String baseUrlSt = client.getBaseUri().toString();
         try {
-            get = new GetMethod(baseUrlSt + OwnCloudClient.STATUS_PATH);
 
-            HttpParams params = get.getParams().getDefaultParams();
-            params.setParameter(HttpMethodParams.USER_AGENT,
-                OwnCloudClientManagerFactory.getUserAgent());
-            get.getParams().setDefaults(params);
+            String url = baseUrlSt + OwnCloudClient.STATUS_PATH;
+
+            final Request request = new Request.Builder()
+                    .url(url)
+                    .build();
 
             client.setFollowRedirects(false);
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+
+            Response response = client.executeHttpMethod(getMethod);
+
+            mLatestResult = new RemoteOperationResult(OK);
+
             boolean isRedirectToNonSecureConnection = false;
-            int status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
-            mLatestResult = new RemoteOperationResult((status == HttpStatus.SC_OK), get);
 
-            String redirectedLocation = mLatestResult.getRedirectedLocation();
-            while (redirectedLocation != null && redirectedLocation.length() > 0
-                && !mLatestResult.isSuccess()) {
+            // TODO Check this, although OkHttp should take care of the redirections
+//            boolean isRedirectToNonSecureConnection = false;
+//            String redirectedLocation = mLatestResult.getRedirectedLocation();
+//            while (redirectedLocation != null && redirectedLocation.length() > 0
+//                && !mLatestResult.isSuccess()) {
+//
+//                isRedirectToNonSecureConnection |= (
+//                    baseUrlSt.startsWith(HTTPS_PREFIX) &&
+//                        redirectedLocation.startsWith(HTTP_PREFIX)
+//                );
+//                get.releaseConnection();
+//                get = new GetMethod(redirectedLocation);
+//                status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
+//                mLatestResult = new RemoteOperationResult(
+//                    (status == HttpStatus.SC_OK),
+//                    get
+//                );
+//                redirectedLocation = mLatestResult.getRedirectedLocation();
+//            }
 
-                isRedirectToNonSecureConnection |= (
-                    baseUrlSt.startsWith(HTTPS_PREFIX) &&
-                        redirectedLocation.startsWith(HTTP_PREFIX)
-                );
-                get.releaseConnection();
-                get = new GetMethod(redirectedLocation);
-                status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
-                mLatestResult = new RemoteOperationResult(
-                    (status == HttpStatus.SC_OK),
-                    get
-                );
-                redirectedLocation = mLatestResult.getRedirectedLocation();
-            }
+            if (response.code() == HttpStatus.SC_OK) {
 
-            String response = get.getResponseBodyAsString();
-            if (status == HttpStatus.SC_OK) {
-                JSONObject json = new JSONObject(response);
-                if (!json.getBoolean(NODE_INSTALLED)) {
+                JSONObject respJSON = new JSONObject(response.body().string());
+                if (!respJSON.getBoolean(NODE_INSTALLED)) {
                     mLatestResult = new RemoteOperationResult(
                         RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
                 } else {
-                    String version = json.getString(NODE_VERSION);
+                    String version = respJSON.getString(NODE_VERSION);
                     OwnCloudVersion ocVersion = new OwnCloudVersion(version);
                     /// the version object will be returned even if the version is invalid, no error code;
                     /// every app will decide how to act if (ocVersion.isVersionValid() == false)
@@ -133,14 +146,14 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                         );
                     }
 
-                    ArrayList<Object> data = new ArrayList<Object>();
+                    ArrayList<Object> data = new ArrayList<>();
                     data.add(ocVersion);
                     mLatestResult.setData(data);
                     retval = true;
                 }
 
             } else {
-                mLatestResult = new RemoteOperationResult(false, get);
+                mLatestResult = new RemoteOperationResult(false, getMethod.getRequest(), response);
             }
 
         } catch (JSONException e) {
@@ -149,10 +162,6 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 
         } catch (Exception e) {
             mLatestResult = new RemoteOperationResult(e);
-
-        } finally {
-            if (get != null)
-                get.releaseConnection();
         }
 
         if (mLatestResult.isSuccess()) {
@@ -196,5 +205,4 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         }
         return mLatestResult;
     }
-
-}
+}
\ No newline at end of file

From 82b7bef113e057cb6a1709d4d40a36985a4d47b1 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 17:29:47 +0200
Subject: [PATCH 040/133] Implement GetRemoteCapabilities using new wrapper

---
 .../lib/common/http/HttpBaseMethod.java       | 31 ++++++++++
 .../lib/common/http/HttpConstants.java        | 24 ++++++++
 .../lib/common/http/nonwebdav/GetMethod.java  | 28 +++++++++
 .../lib/common/http/nonwebdav/HttpMethod.java | 28 +++++++++
 .../lib/common/http/webdav/DavMethod.java     | 28 +++++++++
 .../common/http/webdav/PropfindMethod.java    | 28 +++++++++
 .../GetRemoteCapabilitiesOperation.java       | 57 ++++++++++---------
 .../status/GetRemoteStatusOperation.java      | 22 +++----
 8 files changed, 205 insertions(+), 41 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index 8a73c16b..dab22e8c 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -1,8 +1,39 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http;
 
 import okhttp3.Request;
 import okhttp3.Response;
 
+/**
+ * Wrapper to perform http calls transparently by using:
+ *  - OkHttp for non webdav methods
+ *  - Dav4Android for webdav methods
+ *
+ * @author David González Verdugo
+ */
 public abstract class HttpBaseMethod {
     public abstract Response execute() throws Exception;
     protected Request mRequest;
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index b1235f86..563ea923 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http;
 
 public class HttpConstants {
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
index 6015e474..f2ac6523 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.nonwebdav;
 
 import java.io.IOException;
@@ -6,6 +30,10 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
+/**
+ * OkHttp get calls wrapper
+ * @author David González Verdugo
+ */
 public class GetMethod extends HttpMethod {
 
     public GetMethod(OkHttpClient okHttpClient, Request baseRequest) {
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
index 79640bcf..ec54b9b2 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.nonwebdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
@@ -5,6 +29,10 @@ import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
+/**
+ * Wrapper to perform OkHttp calls
+ * @author David González Verdugo
+ */
 public abstract class HttpMethod extends HttpBaseMethod {
 
     protected OkHttpClient mOkHttpClient;
diff --git a/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
index ba142d4f..cf10aabb 100644
--- a/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.webdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
@@ -7,6 +31,10 @@ import at.bitfire.dav4android.DavResource;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 
+/**
+ * Wrapper to perform WebDAV (dav4android) calls
+ * @author David González Verdugo
+ */
 public abstract class DavMethod extends HttpBaseMethod {
 
     protected DavResource mDavResource;
diff --git a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
index 8fb66819..6891c9f6 100644
--- a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.webdav;
 
 import java.io.IOException;
@@ -12,6 +36,10 @@ import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Response;
 
+/**
+ * Propfind calls wrapper
+ * @author David González Verdugo
+ */
 public class PropfindMethod extends DavMethod {
 
     private int mDepth;
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index d59a32de..f4e87e83 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -29,26 +29,32 @@ package com.owncloud.android.lib.resources.status;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 
+import okhttp3.Request;
+import okhttp3.Response;
+
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * Get the Capabilities from the server
- *
  * Save in Result.getData in a OCCapability object
+ *
+ * @author masensio
+ * @author David González Verdugo
  */
 public class GetRemoteCapabilitiesOperation extends RemoteOperation {
 
     private static final String TAG = GetRemoteCapabilitiesOperation.class.getSimpleName();
 
-
     // OCS Routes
     private static final String OCS_ROUTE = "ocs/v2.php/cloud/capabilities";
 
@@ -116,9 +122,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status;
-        GetMethod get = null;
+        RemoteOperationResult result;
 
         try {
             Uri requestUri = client.getBaseUri();
@@ -126,18 +130,22 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(OCS_ROUTE);    // avoid starting "/" in this method
             uriBuilder.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT);
 
-            // Get Method
-            get = new GetMethod(uriBuilder.build().toString());
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            String url = uriBuilder.build().toString();
 
-            status = client.executeMethod(get);
+            final Request request = new Request.Builder()
+                    .url(url)
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            if(isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+
+            final Response response = client.executeHttpMethod(getMethod);
+
+            if(isSuccess(response.code())) {
                 Log_OC.d(TAG, "Successful response: " + response);
 
                 // Parse the response
-                JSONObject respJSON = new JSONObject(response);
+                JSONObject respJSON = new JSONObject(response.body().string());
                 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
                 JSONObject respMeta = respOCS.getJSONObject(NODE_META);
                 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
@@ -255,7 +263,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
                     }
                     // Result
                     data.add(capability);
-                    result = new RemoteOperationResult(true, get);
+                    result = new RemoteOperationResult(OK);
                     result.setData(data);
 
                     Log_OC.d(TAG, "*** Get Capabilities completed ");
@@ -266,29 +274,24 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
                 }
 
             } else {
-                result = new RemoteOperationResult(false, get);
-                String response = get.getResponseBodyAsString();
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
                 Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
+                if (response.body().string() != null) {
+                    Log_OC.e(TAG, "*** status code: " + response.code() + "; response message: " +
+                            response.body().string());
                 } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
+                    Log_OC.e(TAG, "*** status code: " + response.code());
                 }
             }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting capabilities", e);
-
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
         }
         return result;
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index a76fbb89..1d2a4558 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -24,28 +24,22 @@
 
 package com.owncloud.android.lib.resources.status;
 
-import java.util.ArrayList;
-
-import org.apache.commons.httpclient.HttpStatus;
-
-import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.httpclient.params.HttpParams;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
 import okhttp3.Request;
 import okhttp3.Response;
 
@@ -121,7 +115,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 //                redirectedLocation = mLatestResult.getRedirectedLocation();
 //            }
 
-            if (response.code() == HttpStatus.SC_OK) {
+            if (response.code() == HttpConstants.HTTP_OK) {
 
                 JSONObject respJSON = new JSONObject(response.body().string());
                 if (!respJSON.getBoolean(NODE_INSTALLED)) {

From 944a1186d9d2f897069dacfe95ba2ea715337ea3 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 17:56:38 +0200
Subject: [PATCH 041/133] Use new wrapper in GetRemoteUserAvatar operation

---
 .../lib/common/network/WebdavUtils.java       | 22 ++---
 .../files/DownloadRemoteFileOperation.java    |  4 +-
 .../GetRemoteCapabilitiesOperation.java       |  1 +
 .../users/GetRemoteUserAvatarOperation.java   | 90 +++++++++----------
 4 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
index 1bbf3aa9..62f4045f 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -38,6 +38,8 @@ import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.xml.Namespace;
 
+import okhttp3.Response;
+
 public class WebdavUtils {
     public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat(
             "dd.MM.yyyy hh:mm");
@@ -169,28 +171,26 @@ public class WebdavUtils {
         return rawEtag;
     }
 
-
     /**
      *
-     * @param method
-     * @return
+     * @param response from which to get the etag
+     * @return etag from response
      */
-    public static String getEtagFromResponse(HttpMethod method) {
-        Header eTag = method.getResponseHeader("OC-ETag");
+    public static String getEtagFromResponse(Response response) {
+        String eTag = response.header("OC-ETag");
         if (eTag == null) {
-            eTag = method.getResponseHeader("oc-etag");
+            eTag = response.header("oc-etag");
         }
         if (eTag == null) {
-            eTag = method.getResponseHeader("ETag");
+            eTag = response.header("ETag");
         }
         if (eTag == null) {
-            eTag = method.getResponseHeader("etag");
+            eTag = response.header("etag");
         }
         String result = "";
         if (eTag != null) {
-            result = parseEtag(eTag.getValue());
+            result = eTag;
         }
         return result;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 31bac898..a18672de 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -152,8 +152,8 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                     } else {
                         Log_OC.e(TAG, "Could not read modification time from response downloading " + mRemotePath);
                     }
-
-                    mEtag = WebdavUtils.getEtagFromResponse(mGet);
+                    // TODO
+//                    mEtag = WebdavUtils.getEtagFromResponse(mGet);
                     if (mEtag.length() == 0) {
                         Log_OC.e(TAG, "Could not read eTag from response downloading " + mRemotePath);
                     }
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index f4e87e83..9ee81f97 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -24,6 +24,7 @@
  *
  */
 
+
 package com.owncloud.android.lib.resources.status;
 
 import android.net.Uri;
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 2c1ea9ce..e25beaef 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -1,7 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *
- *   @author David A. Velasco
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,25 +25,31 @@
 
 package com.owncloud.android.lib.resources.users;
 
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.HttpStatus;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
+import okhttp3.Request;
+import okhttp3.Response;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 
 /**
  * Gets avatar about the user logged in, if available
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class GetRemoteUserAvatarOperation extends RemoteOperation {
@@ -71,47 +76,40 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        GetMethod get = null;
+        RemoteOperationResult result;
         InputStream inputStream = null;
         BufferedInputStream bis = null;
         ByteArrayOutputStream bos = null;
+        Response response = null;
 
         try {
-            String uri =
-                client.getBaseUri() + NON_OFFICIAL_AVATAR_PATH +
-                client.getCredentials().getUsername() + "/" + mDimension;
+            String url =
+                    client.getBaseUri() + NON_OFFICIAL_AVATAR_PATH +
+                    client.getCredentials().getUsername() + "/" + mDimension;
             ;
-            Log_OC.d(TAG, "avatar URI: " + uri);
-            get = new GetMethod(uri);
-            /*  Conditioned call is corrupting the input stream of the connection.
-                Seems that response with 304 is also including the avatar in the response body,
-                though it's forbidden by HTTPS specification. Besides, HTTPClient library
-                assumes there is nothing in the response body, but the bytes are read
-                by the next request, resulting in an exception due to a corrupt status line
+            Log_OC.d(TAG, "avatar URI: " + url);
 
-                Maybe when we have a real API we can enable this again.
+            final Request request = new Request.Builder()
+                    .url(url)
+                    .build();
 
-            if (mCurrentEtag != null && mCurrentEtag.length() > 0) {
-                get.addRequestHeader(IF_NONE_MATCH_HEADER, "\"" + mCurrentEtag + "\"");
-            }
-            */
-
-            //get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-            int status = client.executeMethod(get);
-            if (isSuccess(status)) {
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            response = client.executeHttpMethod(getMethod);
 
+            if (isSuccess(response.code())) {
                 // find out size of file to read
                 int totalToTransfer = 0;
-                Header contentLength = get.getResponseHeader("Content-Length");
-                if (contentLength != null && contentLength.getValue().length() > 0) {
-                    totalToTransfer = Integer.parseInt(contentLength.getValue());
+                String contentLength = response.header("Content-Length");
+
+                if (contentLength != null && contentLength.length() > 0) {
+                    totalToTransfer = Integer.parseInt(contentLength);
                 }
 
                 // find out MIME-type!
                 String mimeType;
-                Header contentType = get.getResponseHeader("Content-Type");
-                if (contentType == null || !contentType.getValue().startsWith("image")) {
+                String contentType =response.header("Content-Type");
+
+                if (contentType == null || !contentType.startsWith("image")) {
                     Log_OC.e(
                         TAG, "Not an image, failing with no avatar"
                     );
@@ -120,10 +118,11 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                     );
                     return result;
                 }
-                mimeType = contentType.getValue();
+
+                mimeType = contentType;
 
                 /// download will be performed to a buffer
-                inputStream = get.getResponseBodyAsStream();
+                inputStream = response.body().byteStream();
                 bis = new BufferedInputStream(inputStream);
                 bos = new ByteArrayOutputStream(totalToTransfer);
 
@@ -137,21 +136,21 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 // TODO check total bytes transferred?
 
                 // find out etag
-                String etag = WebdavUtils.getEtagFromResponse(get);
+                String etag = WebdavUtils.getEtagFromResponse(response);
                 if (etag.length() == 0) {
                     Log_OC.w(TAG, "Could not read Etag from avatar");
                 }
 
                 // Result
-                result = new RemoteOperationResult(true, get);
+                result = new RemoteOperationResult(OK);
                 ResultData resultData = new ResultData(bos.toByteArray(), mimeType, etag);
                 ArrayList<Object> data = new ArrayList<Object>();
                 data.add(resultData);
                 result.setData(data);
 
             } else {
-                result = new RemoteOperationResult(false, get);
-                client.exhaustResponse(get.getResponseBodyAsStream());
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                client.exhaustResponse(response.body().byteStream());
             }
 
         } catch (Exception e) {
@@ -159,7 +158,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
             Log_OC.e(TAG, "Exception while getting OC user avatar", e);
 
         } finally {
-            if (get != null) {
+            if (response != null) {
                 try {
                     if (inputStream != null) {
                         client.exhaustResponse(inputStream);
@@ -179,7 +178,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 } catch (IOException o) {
                     Log_OC.e(TAG, "Unexpected exception closing output stream ", o);
                 }
-                get.releaseConnection();
+                response.body().close();
             }
         }
 
@@ -213,5 +212,4 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
             return mAvatarData;
         }
     }
-
-}
+}
\ No newline at end of file

From 3b7950ae59b15b83d5ec470d4965363816f79a26 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 6 Jun 2018 19:02:44 +0200
Subject: [PATCH 042/133] Fix problem when showing size

---
 .../android/lib/resources/files/RemoteFile.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 3dc988bb..9169c3a0 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -24,21 +24,20 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyCollection;
 import at.bitfire.dav4android.property.CreationDate;
+import at.bitfire.dav4android.property.GetContentLength;
 import at.bitfire.dav4android.property.GetContentType;
 import at.bitfire.dav4android.property.GetETag;
 import at.bitfire.dav4android.property.GetLastModified;
@@ -208,6 +207,9 @@ public class RemoteFile implements Parcelable, Serializable {
         this.setCreationTimestamp(properties.get(CreationDate.class) != null
                 ? Long.parseLong(properties.get(CreationDate.class).getCreationDate())
                 : 0);
+        this.setLength(properties.get(GetContentLength.class) != null
+                ? properties.get(GetContentLength.class).getContentLength()
+                : 0);
         this.setMimeType(properties.get(GetContentType.class) != null
                 ? properties.get(GetContentType.class).getType()
                 : "DIR");

From 1a7e6a475d34a3da31d3ae94e8bd5e79b6342849 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 7 Jun 2018 12:13:17 +0200
Subject: [PATCH 043/133] Use the new wrapper methods with
 CreateRemoteShareOperation and GetRemoteShareOperation

---
 .../lib/common/http/nonwebdav/PostMethod.java | 54 +++++++++++
 .../lib/resources/files/RemoteFile.java       |  3 +-
 .../shares/CreateRemoteShareOperation.java    | 90 ++++++++++---------
 .../shares/GetRemoteShareOperation.java       | 64 ++++++-------
 4 files changed, 136 insertions(+), 75 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java

diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
new file mode 100644
index 00000000..0bf4b794
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
@@ -0,0 +1,54 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.nonwebdav;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * OkHttp post calls wrapper
+ * @author David González Verdugo
+ */
+public class PostMethod extends HttpMethod {
+
+    private RequestBody mRequestBody;
+
+    public PostMethod(OkHttpClient okHttpClient, Request baseRequest, RequestBody requestBody){
+        super(okHttpClient, baseRequest);
+        mRequestBody = requestBody;
+    }
+
+    @Override
+    public Response execute() throws Exception {
+        mRequest = mBaseRequest
+                .newBuilder()
+                .post(mRequestBody)
+                .build();
+
+        return mOkHttpClient.newCall(mRequest).execute();
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 9169c3a0..5d30178a 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -314,5 +314,4 @@ public class RemoteFile implements Parcelable, Serializable {
         dest.writeSerializable(mQuotaAvailableBytes);
         dest.writeString(mPrivateLink);
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 01af5bfa..d1dd3fd4 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -1,25 +1,31 @@
 /* ownCloud Android Library is available under MIT license
+<<<<<<< HEAD
  *   @author masensio
  *   @author David A. Velasco
  *   @author David González Verdugo
  *   Copyright (C) 2018 ownCloud GmbH.
  *   
+=======
+ *
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+>>>>>>> Use the new wrapper methods with CreateRemoteShareOperation and GetRemoteShareOperation
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -30,20 +36,27 @@ package com.owncloud.android.lib.resources.shares;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.PostMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.PostMethod;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 
+import okhttp3.FormBody;
+import okhttp3.Request;
+import okhttp3.Response;
+
 /**
  * Creates a new share.  This allows sharing with a user or group or as a link.
+ *
+ * @author masensio
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 public class CreateRemoteShareOperation extends RemoteOperation {
 
@@ -190,28 +203,26 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-        int status;
-
-        PostMethod post = null;
 
+        RemoteOperationResult result = null;
         try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            // Post Method
-            post = new PostMethod(uriBuilder.build().toString());
+            final Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .header("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            post.setRequestHeader("Content-Type",
-                    "application/x-www-form-urlencoded; charset=utf-8"); // necessary for special characters
-
-            post.addParameter(PARAM_PATH, mRemoteFilePath);
-            post.addParameter(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue()));
-            post.addParameter(PARAM_SHARE_WITH, mShareWith);
+            FormBody.Builder formBodyBuilder = new FormBody.Builder()
+                    .add(PARAM_PATH, mRemoteFilePath)
+                    .add(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue()))
+                    .add(PARAM_SHARE_WITH, mShareWith);
 
             if (mName.length() > 0) {
-                post.addParameter(PARAM_NAME, mName);
+                formBodyBuilder.add(PARAM_NAME, mName);
             }
 
             if (mExpirationDateInMillis > 0) {
@@ -219,25 +230,26 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 Calendar expirationDate = Calendar.getInstance();
                 expirationDate.setTimeInMillis(mExpirationDateInMillis);
                 String formattedExpirationDate = dateFormat.format(expirationDate.getTime());
-                post.addParameter(PARAM_EXPIRATION_DATE, formattedExpirationDate);
+                formBodyBuilder.add(PARAM_EXPIRATION_DATE, formattedExpirationDate);
             }
 
             if (mPublicUpload) {
-                post.addParameter(PARAM_PUBLIC_UPLOAD, Boolean.toString(true));
+                formBodyBuilder.add(PARAM_PUBLIC_UPLOAD, Boolean.toString(true));
             }
             if (mPassword != null && mPassword.length() > 0) {
-                post.addParameter(PARAM_PASSWORD, mPassword);
+                formBodyBuilder.add(PARAM_PASSWORD, mPassword);
             }
             if (OCShare.DEFAULT_PERMISSION != mPermissions) {
-                post.addParameter(PARAM_PERMISSIONS, Integer.toString(mPermissions));
+                formBodyBuilder.add(PARAM_PERMISSIONS, Integer.toString(mPermissions));
             }
 
-            post.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            FormBody formBody = formBodyBuilder.build();
 
-            status = client.executeMethod(post);
+            PostMethod postMethod = new PostMethod(client.getOkHttpClient(), request, formBody);
 
-            if (isSuccess(status)) {
-                String response = post.getResponseBodyAsString();
+            Response response = client.executeHttpMethod(postMethod);
+
+            if (isSuccess(response.code())) {
 
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                         new ShareXMLParser()
@@ -245,9 +257,11 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 parser.setOneOrMoreSharesRequired(true);
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response);
+                result = parser.parse(response.body().string());
 
                 if (result.isSuccess() && mGetShareDetails) {
+
+                    // TODO Use executeHttpMethod
                     // retrieve more info - POST only returns the index of the new share
                     OCShare emptyShare = (OCShare) result.getData().get(0);
                     GetRemoteShareOperation getInfo = new GetRemoteShareOperation(
@@ -257,23 +271,17 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 }
 
             } else {
-                result = new RemoteOperationResult(false, post);
+                result = new RemoteOperationResult(false, postMethod.getRequest(), response);
             }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while Creating New Share", e);
-
-        } finally {
-            if (post != null) {
-                post.releaseConnection();
-            }
         }
         return result;
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index bf232d63..1ed1aeb3 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -1,24 +1,30 @@
 /* ownCloud Android Library is available under MIT license
+<<<<<<< HEAD
  *   @author David A. Velasco
  *   @author David González Verdugo
  *   Copyright (C) 2018 ownCloud GmbH.
  *   
+=======
+ *
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+>>>>>>> Use the new wrapper methods with CreateRemoteShareOperation and GetRemoteShareOperation
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -29,15 +35,20 @@ package com.owncloud.android.lib.resources.shares;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
+import okhttp3.Request;
+import okhttp3.Response;
 
 /**
  * Get the data about a Share resource, known its remote ID.
+ *
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class GetRemoteShareOperation extends RemoteOperation {
@@ -51,29 +62,25 @@ public class GetRemoteShareOperation extends RemoteOperation {
         mRemoteId = remoteId;
     }
 
-
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status = -1;
+        RemoteOperationResult result;
 
-        // Get Method
-        GetMethod get = null;
-
-        // Get the response
         try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            get = new GetMethod(uriBuilder.build().toString());
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            final Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            status = client.executeMethod(get);
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            Response response = client.executeHttpMethod(getMethod);
 
-            if (isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
+            if (isSuccess(response.code())) {
 
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
@@ -82,27 +89,20 @@ public class GetRemoteShareOperation extends RemoteOperation {
                 parser.setOneOrMoreSharesRequired(true);
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response);
+                result = parser.parse(response.body().string());
 
             } else {
-                result = new RemoteOperationResult(false, get);
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
             }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting remote shares ", e);
-
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
         }
         return result;
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
-
-
-}
+}
\ No newline at end of file

From 7d534c90ab990f8672819b123a17acb2c63cdbcc Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 7 Jun 2018 13:13:56 +0200
Subject: [PATCH 044/133] Implement get shares operations using the new wrapper
 methods

---
 .../shares/CreateRemoteShareOperation.java    | 13 ++--
 .../shares/GetRemoteShareOperation.java       |  7 --
 .../shares/GetRemoteShareesOperation.java     | 52 +++++++-------
 .../GetRemoteSharesForFileOperation.java      | 70 +++++++++---------
 .../shares/GetRemoteSharesOperation.java      | 72 +++++++++----------
 5 files changed, 97 insertions(+), 117 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index d1dd3fd4..921aafea 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -1,15 +1,9 @@
 /* ownCloud Android Library is available under MIT license
-<<<<<<< HEAD
  *   @author masensio
  *   @author David A. Velasco
  *   @author David González Verdugo
- *   Copyright (C) 2018 ownCloud GmbH.
- *   
-=======
+ *   Copyright (C) 2018 ownCloud GmbH
  *
- *   Copyright (C) 2018 ownCloud GmbH.
- *
->>>>>>> Use the new wrapper methods with CreateRemoteShareOperation and GetRemoteShareOperation
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
@@ -203,8 +197,8 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result;
 
-        RemoteOperationResult result = null;
         try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
@@ -212,7 +206,8 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
             final Request request = new Request.Builder()
                     .url(uriBuilder.build().toString())
-                    .header("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
+                    .header("Content-Type", "application/x-www-form-urlencoded; " +
+                            "charset=utf-8")
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index 1ed1aeb3..8ae1b74f 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -1,14 +1,8 @@
 /* ownCloud Android Library is available under MIT license
-<<<<<<< HEAD
  *   @author David A. Velasco
  *   @author David González Verdugo
  *   Copyright (C) 2018 ownCloud GmbH.
- *   
-=======
  *
- *   Copyright (C) 2018 ownCloud GmbH.
- *
->>>>>>> Use the new wrapper methods with CreateRemoteShareOperation and GetRemoteShareOperation
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
@@ -81,7 +75,6 @@ public class GetRemoteShareOperation extends RemoteOperation {
             Response response = client.executeHttpMethod(getMethod);
 
             if (isSuccess(response.code())) {
-
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                     new ShareXMLParser()
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 3d88ceba..3562c3f4 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -31,17 +31,22 @@ package com.owncloud.android.lib.resources.shares;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 
+import okhttp3.Request;
+import okhttp3.Response;
+
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * Created by masensio on 08/10/2015.
  *
@@ -62,6 +67,10 @@ import java.util.ArrayList;
  *
  * Status codes:
  *    100 - successful
+ *
+ * @author masensio
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 public class GetRemoteShareesOperation extends RemoteOperation{
 
@@ -81,7 +90,6 @@ public class GetRemoteShareesOperation extends RemoteOperation{
     private static final String VALUE_FORMAT = "json";
     private static final String VALUE_ITEM_TYPE = "file";         //  to get the server search for users / groups
 
-
     // JSON Node names
     private static final String NODE_OCS = "ocs";
     private static final String NODE_DATA = "data";
@@ -114,8 +122,6 @@ public class GetRemoteShareesOperation extends RemoteOperation{
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;
-        int status;
-        GetMethod get = null;
 
         try{
             Uri requestUri = client.getBaseUri();
@@ -127,18 +133,19 @@ public class GetRemoteShareesOperation extends RemoteOperation{
             uriBuilder.appendQueryParameter(PARAM_PAGE, String.valueOf(mPage));
             uriBuilder.appendQueryParameter(PARAM_PER_PAGE, String.valueOf(mPerPage));
 
-            // Get Method
-            get = new GetMethod(uriBuilder.build().toString());
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            status = client.executeMethod(get);
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            Response response = client.executeHttpMethod(getMethod);
 
-            if(isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
+            if(isSuccess(response.code())) {
                 Log_OC.d(TAG, "Successful response: " + response);
 
                 // Parse the response
-                JSONObject respJSON = new JSONObject(response);
+                JSONObject respJSON = new JSONObject(response.body().string());
                 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
                 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
                 JSONObject respExact = respData.getJSONObject(NODE_EXACT);
@@ -166,36 +173,29 @@ public class GetRemoteShareesOperation extends RemoteOperation{
                     }
                 }
 
-                // Result
-                result = new RemoteOperationResult(true, get);
+                result = new RemoteOperationResult(OK);
                 result.setData(data);
 
                 Log_OC.d(TAG, "*** Get Users or groups completed " );
 
             } else {
-                result = new RemoteOperationResult(false, get);
-                String response = get.getResponseBodyAsString();
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
                 Log_OC.e(TAG, "Failed response while getting users/groups from the server ");
                 if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
+                    Log_OC.e(TAG, "*** status code: " + response.code() + "; response message: " + response);
                 } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
+                    Log_OC.e(TAG, "*** status code: " + response.code());
                 }
             }
-
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting users/groups", e);
-
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
         }
+
         return result;
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index 5e4eb7d5..c5141e0f 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -3,23 +3,23 @@
  *   @author David A. Velasco
  *   @author David González Verdugo
  *   Copyright (C) 2018 ownCloud GmbH.
- *   
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -29,19 +29,25 @@ package com.owncloud.android.lib.resources.shares;
 
 import android.net.Uri;
 
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+import okhttp3.Response;
 
 /**
  * Provide a list shares for a specific file.
  * The input is the full path of the desired file.
  * The output is a list of everyone who has the file shared with them.
+ *
+ * @author masensio
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 public class GetRemoteSharesForFileOperation extends RemoteOperation {
 
@@ -75,61 +81,53 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;
-        int status;
-
-        GetMethod get = null;
 
         try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            // Get Method
-            get = new GetMethod(uriBuilder.build().toString());
+            HttpUrl.Builder httpBuilder = HttpUrl
+                    .parse(uriBuilder.build().toString())
+                    .newBuilder();
 
-            // Add Parameters to Get Method
-            get.setQueryString(new NameValuePair[]{
-                new NameValuePair(PARAM_PATH, mRemoteFilePath),
-                new NameValuePair(PARAM_RESHARES, String.valueOf(mReshares)),
-                new NameValuePair(PARAM_SUBFILES, String.valueOf(mSubfiles))
-            });
+            httpBuilder.addQueryParameter(PARAM_PATH, mRemoteFilePath);
+            httpBuilder.addQueryParameter(PARAM_RESHARES, String.valueOf(mReshares));
+            httpBuilder.addQueryParameter(PARAM_SUBFILES, String.valueOf(mSubfiles));
 
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            Request request = new Request.Builder()
+                    .url(httpBuilder.build())
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            status = client.executeMethod(get);
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
 
-            if (isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
+            Response response = client.executeHttpMethod(getMethod);
 
+            if (isSuccess(response.code())) {
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                     new ShareXMLParser()
                 );
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response);
+                result = parser.parse(response.body().string());
 
                 if (result.isSuccess()) {
                     Log_OC.d(TAG, "Got " + result.getData().size() + " shares");
                 }
-
             } else {
-                result = new RemoteOperationResult(false, get);
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
             }
-
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting shares", e);
-
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
         }
+
         return result;
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 66c6615f..95519f06 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -1,24 +1,23 @@
 /* ownCloud Android Library is available under MIT license
- *   @author masensio
- *   @author David A. Velasco
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
+ *
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -29,45 +28,46 @@ package com.owncloud.android.lib.resources.shares;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
+import okhttp3.Request;
+import okhttp3.Response;
 
 /**
  * Get the data from the server about ALL the known shares owned by the requester.
+ *
+ * @author masensio
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class GetRemoteSharesOperation extends RemoteOperation {
 
     private static final String TAG = GetRemoteSharesOperation.class.getSimpleName();
 
-
-    public GetRemoteSharesOperation() {
-    }
-
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status = -1;
+        RemoteOperationResult result;
 
-        // Get Method
-        GetMethod get = null;
-
-        // Get the response
         try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            get = new GetMethod(uriBuilder.build().toString());
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-            status = client.executeMethod(get);
+            Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            if (isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+
+            Response response = client.executeHttpMethod(getMethod);
+
+            if (isSuccess(response.code())) {
 
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
@@ -75,26 +75,20 @@ public class GetRemoteSharesOperation extends RemoteOperation {
                 );
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response);
+                result = parser.parse(response.body().string());
             } else {
-                result = new RemoteOperationResult(false, get);
+                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
             }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting remote shares ", e);
-
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
         }
+
         return result;
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
-
-
-}
+}
\ No newline at end of file

From 6d1e2d043478652a81dd57782b275801a087ef63 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 7 Jun 2018 15:43:33 +0200
Subject: [PATCH 045/133] Implement remove share using the new wrapper methods

---
 .../common/http/nonwebdav/DeleteMethod.java   | 50 +++++++++++++++
 .../lib/common/http/nonwebdav/PutMethod.java  | 50 +++++++++++++++
 .../shares/CreateRemoteShareOperation.java    |  6 +-
 .../shares/GetRemoteShareOperation.java       |  2 +-
 .../shares/RemoveRemoteShareOperation.java    | 61 ++++++++++---------
 .../shares/UpdateRemoteShareOperation.java    |  2 +-
 6 files changed, 137 insertions(+), 34 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
 create mode 100644 src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java

diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
new file mode 100644
index 00000000..61e9aa1d
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
@@ -0,0 +1,50 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.nonwebdav;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * OkHttp delete calls wrapper
+ * @author David González Verdugo
+ */
+public class DeleteMethod extends HttpMethod{
+
+    public DeleteMethod(OkHttpClient okHttpClient, Request baseRequest) {
+        super(okHttpClient, baseRequest);
+    }
+
+    @Override
+    public Response execute() throws Exception {
+        mRequest = mBaseRequest
+                .newBuilder()
+                .delete()
+                .build();
+
+        return mOkHttpClient.newCall(mRequest).execute();
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
new file mode 100644
index 00000000..39dcfc8e
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
@@ -0,0 +1,50 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.nonwebdav;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+public class PutMethod extends HttpMethod{
+
+    private RequestBody mRequestBody;
+
+    public PutMethod(OkHttpClient okHttpClient, Request baseRequest, RequestBody requestBody){
+        super(okHttpClient, baseRequest);
+        mRequestBody = requestBody;
+    }
+
+    @Override
+    public Response execute() throws Exception {
+        mRequest = mBaseRequest
+                .newBuilder()
+                .put(mRequestBody)
+                .build();
+
+        return mOkHttpClient.newCall(mRequest).execute();
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 921aafea..7361fa84 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -204,10 +204,10 @@ public class CreateRemoteShareOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            final Request request = new Request.Builder()
+            Request request = new Request.Builder()
                     .url(uriBuilder.build().toString())
-                    .header("Content-Type", "application/x-www-form-urlencoded; " +
-                            "charset=utf-8")
+                    .header("Content-Type", 
+                            "application/x-www-form-urlencoded; charset=utf-8")
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index 8ae1b74f..e1e5443c 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -77,7 +77,7 @@ public class GetRemoteShareOperation extends RemoteOperation {
             if (isSuccess(response.code())) {
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
-                    new ShareXMLParser()
+                        new ShareXMLParser()
                 );
                 parser.setOneOrMoreSharesRequired(true);
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index 9654d43a..8e2fb4d1 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -3,23 +3,23 @@
  *   @author David A. Velasco
  *   @author David González Verdugo
  *   Copyright (C) 2018 ownCloud GmbH.
- *   
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -30,15 +30,21 @@ package com.owncloud.android.lib.resources.shares;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
+import okhttp3.Request;
+import okhttp3.Response;
 
 /**
  * Remove a share
+ *
+ * @author masensio
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class RemoveRemoteShareOperation extends RemoteOperation {
@@ -55,55 +61,52 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
 
     public RemoveRemoteShareOperation(int remoteShareId) {
         mRemoteShareId = remoteShareId;
-
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;
-        int status;
-
-        DeleteMethod delete = null;
 
         try {
+            String id = "/" + String.valueOf(mRemoteShareId);
+
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
-            uriBuilder.appendEncodedPath(String.valueOf(mRemoteShareId));
+            uriBuilder.appendEncodedPath(String.valueOf(id));
 
-            delete = new DeleteMethod(uriBuilder.build().toString());
+            Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            delete.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            DeleteMethod deleteMethod = new DeleteMethod(client.getOkHttpClient(), request);
 
-            status = client.executeMethod(delete);
+            Response response = client.executeHttpMethod(deleteMethod);
 
-            if (isSuccess(status)) {
-                String response = delete.getResponseBodyAsString();
+            if (isSuccess(response.code())) {
 
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
-                    new ShareXMLParser()
+                        new ShareXMLParser()
                 );
-                result = parser.parse(response);
+                result = parser.parse(response.body().string());
 
                 Log_OC.d(TAG, "Unshare " + mRemoteShareId + ": " + result.getLogMessage());
 
             } else {
-                result = new RemoteOperationResult(false, delete);
+                result = new RemoteOperationResult(false, deleteMethod.getRequest(), response);
             }
+
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Unshare Link Exception " + result.getLogMessage(), e);
-
-        } finally {
-            if (delete != null)
-                delete.releaseConnection();
         }
+
         return result;
     }
 
-
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 29f2f48d..04d74bb1 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -172,7 +172,7 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
         if (mName != null) {
             parametersToUpdate.add(new Pair<>(PARAM_NAME, mName));
         }
-        
+
         if (mPassword != null) {
             parametersToUpdate.add(new Pair<>(PARAM_PASSWORD, mPassword));
         }

From 226e332460f43e6688ffdb46ee5fed07afd00749 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 7 Jun 2018 16:26:22 +0200
Subject: [PATCH 046/133] Implement update share using the new wrapper methods
 in library

---
 .../shares/UpdateRemoteShareOperation.java    | 165 ++++++++----------
 1 file changed, 72 insertions(+), 93 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 04d74bb1..9fc15881 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
- *   @author David A. Velasco
- *   Copyright (C) 2016 ownCloud GmbH.
+ *
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,29 +26,31 @@
 package com.owncloud.android.lib.resources.shares;
 
 import android.net.Uri;
-import android.util.Pair;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.nonwebdav.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.List;
 import java.util.Locale;
 
+import okhttp3.FormBody;
+import okhttp3.Request;
+import okhttp3.Response;
+
 
 /**
  * Updates parameters of an existing Share resource, known its remote ID.
- * <p/>
+ *
  * Allow updating several parameters, triggering a request to the server per parameter.
+ *
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class UpdateRemoteShareOperation extends RemoteOperation {
@@ -164,103 +166,80 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        int status;
-
-        /// prepare array of parameters to update
-        List<Pair<String, String>> parametersToUpdate = new ArrayList<>();
-        if (mName != null) {
-            parametersToUpdate.add(new Pair<>(PARAM_NAME, mName));
-        }
-
-        if (mPassword != null) {
-            parametersToUpdate.add(new Pair<>(PARAM_PASSWORD, mPassword));
-        }
-        if (mExpirationDateInMillis < 0) {
-            // clear expiration date
-            parametersToUpdate.add(new Pair<>(PARAM_EXPIRATION_DATE, ""));
-
-        } else if (mExpirationDateInMillis > 0) {
-            // set expiration date
-            DateFormat dateFormat = new SimpleDateFormat(FORMAT_EXPIRATION_DATE, Locale.GERMAN);
-            Calendar expirationDate = Calendar.getInstance();
-            expirationDate.setTimeInMillis(mExpirationDateInMillis);
-            String formattedExpirationDate = dateFormat.format(expirationDate.getTime());
-            parametersToUpdate.add(new Pair<>(PARAM_EXPIRATION_DATE, formattedExpirationDate));
-
-        } // else, ignore - no update
-
-        if (mPublicUpload != null) {
-            parametersToUpdate.add(new Pair<>(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)));
-        }
-
-        // IMPORTANT: permissions parameter needs to be updated after mPublicUpload parameter,
-        // otherwise they would be set always as 1 (READ) in the server when mPublicUpload was updated
-        if (mPermissions > 0) {
-            // set permissions
-            parametersToUpdate.add(new Pair<>(PARAM_PERMISSIONS, Integer.toString(mPermissions)));
-        }
-
-        /// perform required PUT requests
-        PutMethod put = null;
-        String uriString;
+        RemoteOperationResult result;
 
         try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
+            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
-            uriString = uriBuilder.build().toString();
 
-            for (Pair<String, String> parameter : parametersToUpdate) {
-                if (put != null) {
-                    put.releaseConnection();
-                }
-                put = new PutMethod(uriString);
-                put.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-                put.setRequestEntity(new StringRequestEntity(
-                        parameter.first + "=" + parameter.second,
-                        ENTITY_CONTENT_TYPE,
-                        ENTITY_CHARSET
-                ));
+            Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .header("Content-Type",
+                            "application/x-www-form-urlencoded; charset=utf-8")
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-                status = client.executeMethod(put);
+            FormBody.Builder formBodyBuilder = new FormBody.Builder();
 
-                if (status == HttpStatus.SC_OK) {
-                    String response = put.getResponseBodyAsString();
+            // Parameters to update
+            if (mName != null) {
+                formBodyBuilder.add(PARAM_NAME, mName);
+            }
 
-                    // Parse xml response
-                    ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
-                            new ShareXMLParser()
-                    );
-                    parser.setOwnCloudVersion(client.getOwnCloudVersion());
-                    parser.setServerBaseUri(client.getBaseUri());
-                    result = parser.parse(response);
+            if (mExpirationDateInMillis < 0) {
+                // clear expiration date
+                formBodyBuilder.add(PARAM_EXPIRATION_DATE, "");
 
-                } else {
-                    result = new RemoteOperationResult(false, put);
-                }
-                if (!result.isSuccess() &&
-                    !PARAM_NAME.equals(parameter.first)
-                        // fail in "name" parameter will be ignored; requires OCX, will fail
-                        // fails in previous versions
-                    ) {
-                    break;
-                }
+            } else if (mExpirationDateInMillis > 0) {
+                // set expiration date
+                DateFormat dateFormat = new SimpleDateFormat(FORMAT_EXPIRATION_DATE, Locale.GERMAN);
+                Calendar expirationDate = Calendar.getInstance();
+                expirationDate.setTimeInMillis(mExpirationDateInMillis);
+                String formattedExpirationDate = dateFormat.format(expirationDate.getTime());
+                formBodyBuilder.add(PARAM_EXPIRATION_DATE, formattedExpirationDate);
+            } // else, ignore - no update
+
+            if (mPublicUpload != null) {
+                formBodyBuilder.add(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload));
+            }
+
+            // IMPORTANT: permissions parameter needs to be updated after mPublicUpload parameter,
+            // otherwise they would be set always as 1 (READ) in the server when mPublicUpload was updated
+            if (mPermissions > 0) {
+                // set permissions
+                formBodyBuilder.add(PARAM_PERMISSIONS, Integer.toString(mPermissions));
+            }
+
+            FormBody formBody = formBodyBuilder.build();
+
+            PutMethod putMethod = new PutMethod(client.getOkHttpClient(), request, formBody);
+
+            Response response = client.executeHttpMethod(putMethod);
+
+            if (isSuccess(response.code())) {
+                // Parse xml response
+                ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
+                        new ShareXMLParser()
+                );
+                parser.setOwnCloudVersion(client.getOwnCloudVersion());
+                parser.setServerBaseUri(client.getBaseUri());
+                result = parser.parse(response.body().string());
+
+            } else {
+                result = new RemoteOperationResult(false, putMethod.getRequest(), response);
             }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Exception while updating remote share ", e);
-            if (put != null) {
-                put.releaseConnection();
-            }
-
-        } finally {
-            if (put != null) {
-                put.releaseConnection();
-            }
+            Log_OC.e(TAG, "Exception while Creating New Share", e);
         }
+
         return result;
     }
-}
+
+    private boolean isSuccess(int status) {
+        return (status == HttpConstants.HTTP_OK);
+    }
+}
\ No newline at end of file

From 08777c0265fbabcfdcc30f96dd6798f403b3173d Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 7 Jun 2018 18:01:15 +0200
Subject: [PATCH 047/133] Get rid of refactor classes, use methods wrapper

---
 .../owncloud/android/lib/refactor/Log_OC.java | 212 --------
 .../android/lib/refactor/OCContext.java       |  28 -
 .../android/lib/refactor/OwnCloudContext.java |  53 --
 .../refactor/account/AccountTypeUtils.java    |  49 --
 .../lib/refactor/account/AccountUtils.java    | 299 -----------
 .../lib/refactor/account/OCAccount.java       | 159 ------
 .../credentials/OCAnonymousCredentials.java   |  31 --
 .../credentials/OCBasicCredentials.java       |  67 ---
 .../credentials/OCBearerCredentials.java      |  67 ---
 .../credentials/OCCredentials.java            |  41 --
 .../credentials/OCSamlSsoCredentials.java     |  85 ---
 .../OwnCloudCredentialsFactory.java           |  85 ---
 .../oauth/BearerAuthScheme.java               | 261 ---------
 .../oauth/BearerCredentials.java              | 102 ----
 .../oauth/OAuth2ClientConfiguration.java      |  55 --
 .../authentication/oauth/OAuth2Constants.java |  68 ---
 .../authentication/oauth/OAuth2GrantType.java |  46 --
 .../authentication/oauth/OAuth2Provider.java  |  66 ---
 .../oauth/OAuth2ProvidersRegistry.java        | 122 -----
 .../oauth/OAuth2QueryParser.java              |  75 ---
 .../oauth/OAuth2RequestBuilder.java           |  48 --
 .../oauth/OAuth2ResponseParser.java           |  77 ---
 .../oauth/OwnCloudOAuth2Provider.java         |  94 ----
 .../oauth/OwnCloudOAuth2RequestBuilder.java   | 151 ------
 .../OAuth2GetAccessTokenOperation.java        | 115 ----
 .../OAuth2RefreshAccessTokenOperation.java    | 108 ----
 .../exceptions/AccountNotFoundException.java  |  23 -
 .../CertificateCombinedException.java         | 140 -----
 .../OperationCancelledException.java          |  34 --
 .../refactor/operations/RemoteOperation.java  | 131 -----
 .../operations/RemoteOperationResult.java     | 500 ------------------
 .../files/DownloadRemoteFileOperation.java    |  67 ---
 .../operations/files/PropfindOperation.java   |  61 ---
 .../files/RemoveRemoteFileOperation.java      |  65 ---
 .../files/UploadRemoteFileOperation.java      | 103 ----
 .../refactor/utils/ErrorMessageParser.java    | 138 -----
 .../InvalidCharacterExceptionParser.java      | 144 -----
 .../lib/resources/files/RemoteFile.java       |   6 +-
 38 files changed, 3 insertions(+), 3973 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/refactor/Log_OC.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/OCContext.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/OwnCloudContext.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/account/AccountUtils.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/account/OCAccount.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java
 delete mode 100644 src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java

diff --git a/src/com/owncloud/android/lib/refactor/Log_OC.java b/src/com/owncloud/android/lib/refactor/Log_OC.java
deleted file mode 100644
index 53499f30..00000000
--- a/src/com/owncloud/android/lib/refactor/Log_OC.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.owncloud.android.lib.refactor;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import android.util.Log;
-
-
-public class Log_OC {
-    private static final String SIMPLE_DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";
-    private static final String LOG_FOLDER_NAME = "log";
-    private static final long MAX_FILE_SIZE = 1000000; // 1MB
-
-    private static String mOwncloudDataFolderLog = "owncloud_log";
-
-    private static File mLogFile;
-    private static File mFolder;
-    private static BufferedWriter mBuf;
-
-    private static String[] mLogFileNames = {"currentLog.txt", "olderLog.txt"};
-
-    private static boolean isMaxFileSizeReached = false;
-    private static boolean isEnabled = false;
-
-    public static void setLogDataFolder(String logFolder){
-    	mOwncloudDataFolderLog = logFolder;
-    }
-
-    public static void i(String TAG, String message){
-        Log.i(TAG, message);
-        appendLog(TAG+" : "+ message);
-    }
-
-    public static void d(String TAG, String message){
-        Log.d(TAG, message);
-        appendLog(TAG + " : " + message);
-    }
-    public static void d(String TAG, String message, Exception e) {
-        Log.d(TAG, message, e);
-        appendLog(TAG + " : " + message + " Exception : "+ e.getStackTrace());
-    }
-    public static void e(String TAG, String message){
-        Log.e(TAG, message);
-        appendLog(TAG + " : " + message);
-    }
-    
-    public static void e(String TAG, String message, Throwable e) {
-        Log.e(TAG, message, e);
-        appendLog(TAG+" : " + message +" Exception : " + e.getStackTrace());
-    }
-    
-    public static void v(String TAG, String message){
-        Log.v(TAG, message);
-        appendLog(TAG+" : "+ message);
-    }
-    
-    public static void w(String TAG, String message) {
-        Log.w(TAG, message);
-        appendLog(TAG+" : "+ message);
-    }
-    
-    public static void wtf(String TAG, String message) {
-        Log.wtf(TAG, message);
-        appendLog(TAG+" : "+ message);
-    }
-
-    /**
-     * Start doing logging
-     * @param storagePath : directory for keeping logs
-     */
-    synchronized public static void startLogging(String storagePath) {
-		String logPath = storagePath + File.separator +
-			mOwncloudDataFolderLog + File.separator + LOG_FOLDER_NAME;
-        mFolder = new File(logPath);
-        mLogFile = new File(mFolder + File.separator + mLogFileNames[0]);
-
-        boolean isFileCreated = false;
-
-        if (!mFolder.exists()) {
-            mFolder.mkdirs();
-            isFileCreated = true;
-            Log.d("LOG_OC", "Log file created");
-        }
-
-        try { 
-
-            // Create the current log file if does not exist
-            mLogFile.createNewFile();
-            mBuf = new BufferedWriter(new FileWriter(mLogFile, true));
-            isEnabled = true;
-
-            if (isFileCreated) {
-                appendPhoneInfo();
-            }
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if(mBuf != null) {
-                try {
-                    mBuf.close();
-                } catch(IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    synchronized public static void stopLogging() {
-        try {
-			if (mBuf != null)
-                mBuf.close();
-            isEnabled = false;
-
-            mLogFile = null;
-            mFolder = null;
-            mBuf = null;
-            isMaxFileSizeReached = false;
-            isEnabled = false;
-
-        } catch (IOException e) {
-            // Because we are stopping logging, we only log to Android console.
-            Log.e("OC_Log", "Closing log file failed: ", e);
-        } catch (Exception e) {
-            // This catch should never fire because we do null check on mBuf.
-            // But just for the sake of stability let's log this odd situation.
-            // Because we are stopping logging, we only log to Android console.
-            Log.e("OC_Log", "Stopping logging failed: ", e);
-        }
-    }
-
-    /**
-     * Delete history logging
-     */
-    public static void deleteHistoryLogging() {
-        File folderLogs = new File(mFolder + File.separator);
-        if(folderLogs.isDirectory()){
-            String[] myFiles = folderLogs.list();
-            for (int i=0; i<myFiles.length; i++) {
-                File myFile = new File(folderLogs, myFiles[i]);
-                myFile.delete();
-            }
-        }
-    }
-    
-    /**
-     * Append the info of the device
-     */
-    private static void appendPhoneInfo() {
-        appendLog("Model : " + android.os.Build.MODEL);
-        appendLog("Brand : " + android.os.Build.BRAND);
-        appendLog("Product : " + android.os.Build.PRODUCT);
-        appendLog("Device : " + android.os.Build.DEVICE);
-        appendLog("Version-Codename : " + android.os.Build.VERSION.CODENAME);
-        appendLog("Version-Release : " + android.os.Build.VERSION.RELEASE);
-    }
-    
-    /**
-     * Append to the log file the info passed
-     * @param text : text for adding to the log file
-     */
-    synchronized private static void appendLog(String text) {
-
-        if (isEnabled) {
-
-            if (isMaxFileSizeReached) {
-
-                // Move current log file info to another file (old logs)
-                File olderFile = new File(mFolder + File.separator + mLogFileNames[1]);
-                if (mLogFile.exists()) {
-                    mLogFile.renameTo(olderFile);
-                }
-
-                // Construct a new file for current log info
-                mLogFile = new File(mFolder + File.separator + mLogFileNames[0]);
-                isMaxFileSizeReached = false;
-            }
-
-	        String timeStamp = new SimpleDateFormat(SIMPLE_DATE_FORMAT).format(Calendar.getInstance().getTime());
-
-	        try {
-	            mBuf = new BufferedWriter(new FileWriter(mLogFile, true));
-	            mBuf.newLine();
-	            mBuf.write(timeStamp);
-	            mBuf.newLine();
-	            mBuf.write(text);
-	            mBuf.newLine();
-	        } catch (IOException e) {
-	            e.printStackTrace();
-	        } finally {
-                try {
-                    mBuf.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            // Check if current log file size is bigger than the max file size defined
-            if (mLogFile.length() > MAX_FILE_SIZE) {
-                isMaxFileSizeReached = true;
-            }
-        }
-    }
-
-    public static String[] getLogFileNames() {
-        return mLogFileNames;
-    }
-}
diff --git a/src/com/owncloud/android/lib/refactor/OCContext.java b/src/com/owncloud/android/lib/refactor/OCContext.java
deleted file mode 100644
index e91a4240..00000000
--- a/src/com/owncloud/android/lib/refactor/OCContext.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.owncloud.android.lib.refactor;
-
-import com.owncloud.android.lib.refactor.account.OCAccount;
-
-public class OCContext {
-    private static final String TAG = OCContext.class.toString();
-    private static final int MAX_REDIRECTIONS_COUNT = 3;
-    private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
-    private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
-    private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
-    private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
-
-    private OCAccount mOCAccount;
-    private String mUserAgent;
-
-    public OCContext(OCAccount account, String userAgent) {
-        mOCAccount = account;
-        mUserAgent = userAgent;
-    }
-
-    public OCAccount getOCAccount() {
-        return mOCAccount;
-    }
-
-    public String getUserAgent() {
-        return mUserAgent;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java b/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
deleted file mode 100644
index 008b10e0..00000000
--- a/src/com/owncloud/android/lib/refactor/OwnCloudContext.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.owncloud.android.lib.refactor;
-
-import android.net.Uri;
-
-import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
-
-
-public class OwnCloudContext {
-    private static final String TAG = OwnCloudContext.class.toString();
-
-    public static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
-    public static final String STATUS_PATH = "/status.php";
-    public static final String FILES_WEB_PATH = "/index.php/apps/files";
-
-    private static final int MAX_REDIRECTIONS_COUNT = 3;
-    private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
-    private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
-    private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
-    private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
-
-    private OCCredentials mCredentials = null;
-    private Uri mBaseUri;
-
-    public static final class Builder {
-        OwnCloudContext ocContext = new OwnCloudContext();
-
-        public Builder setCredentials(OCCredentials credentials) {
-            ocContext.mCredentials = credentials;
-            return this;
-        }
-
-        public Builder setBaseUri(Uri baseUri) {
-            ocContext.mBaseUri = baseUri;
-            return this;
-        }
-
-        public OwnCloudContext build() {
-            return ocContext;
-        }
-    }
-
-    public OCCredentials getCredentials() {
-        return mCredentials;
-    }
-
-    public Uri getBaseUri() {
-        return mBaseUri;
-    }
-
-    public Uri getWebdavUri() {
-        return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java
deleted file mode 100644
index 009194e0..00000000
--- a/src/com/owncloud/android/lib/refactor/account/AccountTypeUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.account;
-
-/**
- * @author masensio
- * @author David A. Velasco
- */
-public class AccountTypeUtils {
-
-    public static String getAuthTokenTypePass(String accountType) {
-        return accountType + ".password";
-    }
-    
-    public static String getAuthTokenTypeAccessToken(String accountType) {
-        return accountType  + ".oauth2.access_token";
-    }
-    
-    public static String getAuthTokenTypeRefreshToken(String accountType) {
-        return accountType  + ".oauth2.refresh_token";
-    }
-    
-    public static String getAuthTokenTypeSamlSessionCookie(String accountType) {
-        return accountType  +  ".saml.web_sso.session_cookie";
-    }
-    
-}
diff --git a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java b/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
deleted file mode 100644
index 2abe32c4..00000000
--- a/src/com/owncloud/android/lib/refactor/account/AccountUtils.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2017 ownCloud GmbH.
- *   Copyright (C) 2012  Bartek Przybylski
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.account;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountsException;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.content.Context;
-import android.net.Uri;
-
-import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
-import com.owncloud.android.lib.refactor.authentication.credentials.OCBearerCredentials;
-import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
-import com.owncloud.android.lib.refactor.authentication.credentials.OCSamlSsoCredentials;
-import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
-
-import org.apache.commons.httpclient.auth.AuthenticationException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import okhttp3.Cookie;
-
-public class AccountUtils {
-
-    private static final String TAG = AccountUtils.class.getSimpleName();
-
-    /**
-     * Constructs full url to host and webdav resource basing on host version
-     *
-     * @param context               Valid Android {@link Context}, needed to access the {@link AccountManager}
-     * @param account               A stored ownCloud {@link Account}
-     * @return                      Full URL to WebDAV endpoint in the server corresponding to 'account'.
-     * @throws AccountNotFoundException When 'account' is unknown for the AccountManager
-     */
-    public static String getWebDavUrlForAccount(Context context, Account account)
-        throws AccountNotFoundException {
-
-        return getBaseUrlForAccount(context, account) + RemoteOperation.WEBDAV_PATH_4_0;
-    }
-
-
-    /**
-     * Extracts url server from the account
-     *
-     * @param context               Valid Android {@link Context}, needed to access the {@link AccountManager}
-     * @param account               A stored ownCloud {@link Account}
-     * @return                      Full URL to the server corresponding to 'account', ending in the base path
-     *                              common to all API endpoints.
-     * @throws AccountNotFoundException When 'account' is unknown for the AccountManager
-     */
-    public static String getBaseUrlForAccount(Context context, Account account)
-        throws AccountNotFoundException {
-        AccountManager ama = AccountManager.get(context.getApplicationContext());
-        String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL);
-
-        if (baseurl == null)
-            throw new AccountNotFoundException(account, "Account not found", null);
-
-        return baseurl;
-    }
-
-
-    /**
-     * Get the username corresponding to an OC account.
-     *
-     * @param account An OC account
-     * @return Username for the given account, extracted from the account.name
-     */
-    public static String getUsernameForAccount(Account account) {
-        String username = null;
-        try {
-            username = account.name.substring(0, account.name.lastIndexOf('@'));
-        } catch (Exception e) {
-            Log_OC.e(TAG, "Couldn't get a username for the given account", e);
-        }
-        return username;
-    }
-
-    /**
-     * Get the stored server version corresponding to an OC account.
-     *
-     * @param account   An OC account
-     * @param context   Application context
-     * @return Version of the OC server, according to last check
-     */
-    public static OwnCloudVersion getServerVersionForAccount(Account account, Context context) {
-        AccountManager ama = AccountManager.get(context);
-        OwnCloudVersion version = null;
-        try {
-            String versionString = ama.getUserData(account, Constants.KEY_OC_VERSION);
-            version = new OwnCloudVersion(versionString);
-
-        } catch (Exception e) {
-            Log_OC.e(TAG, "Couldn't get a the server version for an account", e);
-        }
-        return version;
-    }
-
-    /**
-     * @return OCCredentials
-     * @throws IOException
-     * @throws AuthenticatorException
-     * @throws OperationCanceledException
-     */
-
-    /**
-     *
-     * @param context an Android context
-     * @param account the coresponding Android account
-     * @return
-     * @throws OperationCanceledException
-     * @throws AuthenticatorException
-     * @throws IOException
-     */
-    public static OCCredentials getCredentialsForAccount(Context context, Account account)
-        throws OperationCanceledException, AuthenticatorException, IOException {
-
-        final AccountManager am = AccountManager.get(context);
-        final String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
-        final boolean isOauth2 = supportsOAuth2 != null && supportsOAuth2.equals("TRUE");
-        String supportsSamlSSo = am.getUserData(account,
-                AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO);
-        final boolean isSamlSso = supportsSamlSSo != null && supportsSamlSSo.equals("TRUE");
-        final String username = AccountUtils.getUsernameForAccount(account);
-
-        if (isOauth2) {
-            final String accessToken = am.blockingGetAuthToken(
-                account,
-                AccountTypeUtils.getAuthTokenTypeAccessToken(account.type),
-                false);
-
-            return new OCBearerCredentials(username, accessToken);
-
-        } else if (isSamlSso) {
-
-            try {
-                final String accessToken = am.blockingGetAuthToken(
-                        account,
-                        AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(account.type),
-                        false);
-
-                return new OCSamlSsoCredentials(username, accessToken,
-                        Uri.parse(getBaseUrlForAccount(context, account)));
-            } catch (AccountNotFoundException e) {
-                throw new AuthenticationException("Account not found", e);
-            }
-
-        } else {
-            final String password = am.blockingGetAuthToken(
-                account,
-                AccountTypeUtils.getAuthTokenTypePass(account.type),
-                false);
-
-            return new OCBasicCredentials(username, password);
-        }
-    }
-
-
-    public static String buildAccountName(Uri serverBaseUrl, String username) {
-        if (serverBaseUrl.getScheme() == null) {
-            serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
-        }
-
-        // Remove http:// or https://
-        String url = serverBaseUrl.toString();
-        if (url.contains("://")) {
-            url = url.substring(serverBaseUrl.toString().indexOf("://") + 3);
-        }
-        String accountName = username + "@" + url;
-
-        return accountName;
-    }
-
-    public static void saveCookies(List<Cookie> cookies, Account savedAccount, Context context) {
-
-        // Account Manager
-        AccountManager ac = AccountManager.get(context.getApplicationContext());
-
-        if (cookies != null && cookies.size() != 0) {
-            StringBuilder cookiesString = new StringBuilder();
-            for (Cookie cookie : cookies) {
-                cookiesString.append(cookiesString + cookie.toString() + ";");
-            }
-
-            ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString.toString());
-        }
-
-    }
-
-
-    /**
-     *  Restore the client cookies persisted in an account stored in the system AccountManager.
-     *
-     * @param account
-     * @param context
-     * @return
-     * @throws AccountsException
-     */
-    public static List<Cookie> getCookiesFromAccount(Account account, Context context) throws AccountsException {
-        if (account == null) {
-            Log_OC.d(TAG, "Cannot restore cookie for null account");
-            return new ArrayList<>();
-        }
-
-        Log_OC.d(TAG, "Restoring cookies for " + account.name);
-
-        final AccountManager am = AccountManager.get(context.getApplicationContext());
-        final Uri serverUri = Uri.parse(getBaseUrlForAccount(context, account));
-        final String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
-        final List<Cookie> cookies = new ArrayList<>();
-
-        if (cookiesString != null) {
-            String[] rawCookies = cookiesString.split(";");
-            for (String rawCookie : rawCookies) {
-                final int equalPos = rawCookie.indexOf('=');
-
-                cookies.add(new Cookie.Builder()
-                        .name(rawCookie.substring(0, equalPos))
-                        .value(rawCookie.substring(equalPos + 1))
-                        .domain(serverUri.getHost())
-                        .path(serverUri.getPath())
-                        .build());
-            }
-        }
-        return cookies;
-    }
-
-    public static class Constants {
-        /**
-         * Version should be 3 numbers separated by dot so it can be parsed by
-         * {@link OwnCloudVersion}
-         */
-        public static final String KEY_OC_VERSION = "oc_version";
-        /**
-         * Base url should point to owncloud installation without trailing / ie:
-         * http://server/path or https://owncloud.server
-         */
-        public static final String KEY_OC_BASE_URL = "oc_base_url";
-        /**
-         * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.
-         */
-        public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2";
-        /**
-         * Flag signaling if the ownCloud server can be accessed with session cookies from SAML-based web single-sign-on.
-         */
-        public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso";
-        /**
-         * OC account cookies
-         */
-        public static final String KEY_COOKIES = "oc_account_cookies";
-
-        /**
-         * OC account version
-         */
-        public static final String KEY_OC_ACCOUNT_VERSION = "oc_account_version";
-
-        /**
-         * User's display name
-         */
-        public static final String KEY_DISPLAY_NAME = "oc_display_name";
-
-        /**
-         * OAuth2 refresh token
-         **/
-        public static final String KEY_OAUTH2_REFRESH_TOKEN = "oc_oauth2_refresh_token";
-
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/account/OCAccount.java b/src/com/owncloud/android/lib/refactor/account/OCAccount.java
deleted file mode 100644
index a84eac2d..00000000
--- a/src/com/owncloud/android/lib/refactor/account/OCAccount.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.account;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.content.Context;
-import android.net.Uri;
-
-import com.owncloud.android.lib.refactor.authentication.credentials.OCAnonymousCredentials;
-import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
-import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
-
-import org.apache.commons.httpclient.auth.AuthenticationException;
-
-import java.io.IOException;
-
-/**
- * OwnCloud Account
- * 
- * @author David A. Velasco
- */
-public class OCAccount {
-
-    private Uri mBaseUri;
-    private OCCredentials mCredentials;
-    private String mDisplayName;
-    private String mSavedAccountName;
-    private Account mSavedAccount;
-
-
-    /**
-     * Constructor for already saved OC accounts.
-     *
-     * Do not use for anonymous credentials.
-     */
-    public OCAccount(Account savedAccount, Context context) throws AccountNotFoundException, IOException, OperationCanceledException, AuthenticatorException {
-        if (savedAccount == null) {
-            throw new IllegalArgumentException("Parameter 'savedAccount' cannot be null");
-        }
-
-        if (context == null) {
-            throw new IllegalArgumentException("Parameter 'context' cannot be null");
-        }
-
-        mSavedAccount = savedAccount;
-        mSavedAccountName = savedAccount.name;
-        mCredentials = AccountUtils.getCredentialsForAccount(context, savedAccount);
-
-        AccountManager ama = AccountManager.get(context.getApplicationContext());
-        String baseUrl = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_OC_BASE_URL);
-        if (baseUrl == null ) {
-            throw new AccountNotFoundException(mSavedAccount, "Account not found", null);
-        }
-        mBaseUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, mSavedAccount));
-        mDisplayName = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_DISPLAY_NAME);
-    }
-
-
-    /**
-     * Constructor for non yet saved OC accounts.
-     *
-     * @param baseUri           URI to the OC server to get access to.
-     * @param credentials       Credentials to authenticate in the server. NULL is valid for anonymous credentials.
-     */
-    public OCAccount(Uri baseUri, OCCredentials credentials) {
-        if (baseUri == null) {
-            throw new IllegalArgumentException("Parameter 'baseUri' cannot be null");
-        }
-        mSavedAccount = null;
-        mSavedAccountName = null;
-        if(baseUri != null && !baseUri.equals("")) {
-            mBaseUri = baseUri;
-        } else {
-            throw new IllegalArgumentException("baseUri can not be null or empty");
-        }
-        mCredentials = credentials != null
-                ? credentials
-                : new OCAnonymousCredentials();
-        String username = mCredentials.getUsername();
-        if (username != null) {
-            mSavedAccountName = AccountUtils.buildAccountName(mBaseUri, username);
-        }
-    }
-
-    /**
-     * Method for deferred load of account attributes from AccountManager
-     *
-     * @param context
-     * @throws AccountNotFoundException
-     * @throws AuthenticatorException
-     * @throws IOException
-     * @throws OperationCanceledException
-     */
-    public void loadCredentials(Context context)
-        throws AccountNotFoundException, AuthenticatorException,
-                IOException, OperationCanceledException {
-
-        if (context == null) {
-            throw new IllegalArgumentException("Parameter 'context' cannot be null");
-        }
-
-        if (mSavedAccount != null) {
-            mCredentials = AccountUtils.getCredentialsForAccount(context, mSavedAccount);
-        }
-    }
-
-    public Uri getBaseUri() {
-        return mBaseUri;
-    }
-            
-    public OCCredentials getCredentials() {
-        return mCredentials;
-    }
-    
-    public String getName() {
-    	return mSavedAccountName;
-    }
-
-    public Account getSavedAccount() {
-        return mSavedAccount;
-    }
-
-    public String getDisplayName() {
-        if (mDisplayName != null && mDisplayName.length() > 0) {
-            return mDisplayName;
-        } else if (mCredentials != null) {
-            return mCredentials.getUsername();
-        } else if (mSavedAccount != null) {
-            return AccountUtils.getUsernameForAccount(mSavedAccount);
-        } else {
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
deleted file mode 100644
index fa0d04c5..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCAnonymousCredentials.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.owncloud.android.lib.refactor.authentication.credentials;
-
-import java.util.HashMap;
-import java.util.Map;
-public class OCAnonymousCredentials implements OCCredentials {
-
-    @Override
-    public Map<String, String> getCredentialHeaders() {
-        return new HashMap<>(0);
-    }
-
-    @Override
-    public String getCredentialCookie() {
-        return null;
-    }
-
-    @Override
-    public String getUsername() {
-        return "";
-    }
-
-    @Override
-    public String getAuthToken() {
-        return null;
-    }
-
-    @Override
-    public boolean authTokenCanBeRefreshed() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
deleted file mode 100644
index abb2b27b..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBasicCredentials.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.refactor.authentication.credentials;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.Credentials;
-
-public class OCBasicCredentials implements OCCredentials {
-
-    private String mUsername;
-    private String mPassword;
-
-    public OCBasicCredentials(String username, String password) {
-        mUsername = username != null ? username : "";
-        mPassword = password != null ? password : "";
-    }
-
-    @Override
-    public Map<String, String> getCredentialHeaders() {
-        HashMap<String, String> header = new HashMap<>(1);
-        header.put("Authorization", Credentials.basic(mUsername, mPassword));
-        return header;
-    }
-
-    @Override
-    public String getCredentialCookie() {
-        return null;
-    }
-
-    @Override
-    public String getUsername() {
-        return mUsername;
-    }
-
-    @Override
-    public String getAuthToken() {
-        return mPassword;
-    }
-
-    @Override
-    public boolean authTokenCanBeRefreshed() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
deleted file mode 100644
index 92f35689..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCBearerCredentials.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.refactor.authentication.credentials;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class OCBearerCredentials implements OCCredentials {
-
-    private String mUsername;
-    private String mAccessToken;
-
-    public OCBearerCredentials(String username, String accessToken) {
-        mUsername = username != null ? username : "";
-        mAccessToken = accessToken != null ? accessToken : "";
-    }
-
-    @Override
-    public Map<String, String> getCredentialHeaders() {
-        HashMap<String, String> header = new HashMap<>(1);
-        header.put("Authorization", "Bearer " + mAccessToken);
-        return header;
-    }
-
-    @Override
-    public String getCredentialCookie() {
-        return null;
-    }
-
-    @Override
-    public String getUsername() {
-        // not relevant for authentication, but relevant for informational purposes
-        return mUsername;
-    }
-
-    @Override
-    public String getAuthToken() {
-        return mAccessToken;
-    }
-
-    @Override
-    public boolean authTokenCanBeRefreshed() {
-        return true;
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java
deleted file mode 100644
index 63ff805b..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCCredentials.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.credentials;
-
-import java.util.Map;
-
-public interface OCCredentials {
-
-    Map<String, String> getCredentialHeaders();
-
-    //TODO: Remove this once SAML is obsolet
-    String getCredentialCookie();
-
-    String getUsername();
-
-    String getAuthToken();
-
-    boolean authTokenCanBeRefreshed();
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
deleted file mode 100644
index b974a79c..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OCSamlSsoCredentials.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.refactor.authentication.credentials;
-
-import android.net.Uri;
-
-import org.apache.commons.httpclient.Cookie;
-import java.util.HashMap;
-import java.util.Map;
-
-public class OCSamlSsoCredentials implements OCCredentials {
-
-    private final String mUsername;
-    private final String mSessionCookie;
-    private final Uri mBaseUrl;
-
-    public OCSamlSsoCredentials(String username, String sessionCookie, Uri baseUrl) {
-        mUsername = username != null ? username : "";
-        mSessionCookie = sessionCookie != null ? sessionCookie : "";
-        mBaseUrl = baseUrl;
-    }
-
-    @Override
-    public String getCredentialCookie() {
-
-        String[] rawCookies = mSessionCookie.split(";");
-        StringBuilder processedCookies = new StringBuilder();
-        Cookie cookie = null;
-        for (final String rawCookie : rawCookies) {
-            int equalPos = rawCookie.indexOf('=');
-            if (equalPos >= 0) {
-                cookie = new Cookie();
-                cookie.setName(rawCookie.substring(0, equalPos));
-                cookie.setValue(rawCookie.substring(equalPos + 1));
-                cookie.setDomain(mBaseUrl.getHost());    // VERY IMPORTANT
-                cookie.setPath(mBaseUrl.getPath());    // VERY IMPORTANT
-                processedCookies.append(cookie.toExternalForm() + ";");
-            }
-        }
-        return processedCookies.toString();
-    }
-
-    @Override
-    public Map<String, String> getCredentialHeaders() {
-        return new HashMap<>(0);
-    }
-
-    @Override
-    public String getUsername() {
-        // not relevant for authentication, but relevant for informational purposes
-        return mUsername;
-    }
-
-    @Override
-    public String getAuthToken() {
-        return mSessionCookie;
-    }
-
-    @Override
-    public boolean authTokenCanBeRefreshed() {
-        return false;
-    }
-
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java
deleted file mode 100644
index 3bcc1ef6..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/credentials/OwnCloudCredentialsFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.credentials;
-
-import java.util.Map;
-
-public class OwnCloudCredentialsFactory {
-
-    public static final String CREDENTIAL_CHARSET = "UTF-8";
-
-    private static OCAnonymousCredentials sAnonymousCredentials;
-
-    public static OCCredentials newBasicCredentials(String username, String password) {
-        return new OCBasicCredentials(username, password);
-    }
-
-    public static OCCredentials newBearerCredentials(String username, String authToken) {
-        return new OCBearerCredentials(username, authToken);
-    }
-
-    public static OCCredentials newSamlSsoCredentials(String username, String sessionCookie) {
-        return new OCSamlSsoCredentials(username, sessionCookie, null);
-    }
-
-    public static final OCCredentials getAnonymousCredentials() {
-        if (sAnonymousCredentials == null) {
-            sAnonymousCredentials = new OCAnonymousCredentials();
-        }
-        return sAnonymousCredentials;
-    }
-
-    public static final class OCAnonymousCredentials implements OCCredentials {
-
-        protected OCAnonymousCredentials() {
-        }
-
-        @Override
-        public String getAuthToken() {
-            return "";
-        }
-
-        @Override
-        public boolean authTokenCanBeRefreshed() {
-            return false;
-        }
-
-        @Override
-        public Map<String, String> getCredentialHeaders() {
-            return null;
-        }
-
-        @Override
-        public String getCredentialCookie() {
-            return null;
-        }
-
-        @Override
-        public String getUsername() {
-            // no user name
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java
deleted file mode 100644
index b37fdfd7..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerAuthScheme.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.auth.AuthChallengeParser;
-import org.apache.commons.httpclient.auth.AuthScheme;
-import org.apache.commons.httpclient.auth.AuthenticationException;
-import org.apache.commons.httpclient.auth.InvalidCredentialsException;
-import org.apache.commons.httpclient.auth.MalformedChallengeException;
-
-import java.util.Map;
-
-
-/**
- * Bearer authentication scheme as defined in RFC 6750.
- * 
- * @author David A. Velasco
- */
-
-public class BearerAuthScheme implements AuthScheme /*extends RFC2617Scheme*/ {
-    
-    private static final String TAG = BearerAuthScheme.class.getSimpleName();
-
-    public static final String AUTH_POLICY = "Bearer";
-    
-    /** Whether the bearer authentication process is complete */
-    private boolean mComplete;
-    
-    /** Authentication parameter map */
-    @SuppressWarnings("rawtypes")
-	private Map mParams = null;
-    
-    
-    /**
-     * Default constructor for the bearer authentication scheme.
-     */
-    public BearerAuthScheme() {
-        mComplete = false;
-    }
-
-    /**
-     * Constructor for the basic authentication scheme.
-     * 
-     * @param   challenge                       Authentication challenge
-     * 
-     * @throws  MalformedChallengeException     Thrown if the authentication challenge is malformed
-     */
-    public BearerAuthScheme(final String challenge) throws MalformedChallengeException {
-        processChallenge(challenge);
-        mComplete = true;
-    }
-
-    /**
-     * Returns textual designation of the bearer authentication scheme.
-     * 
-     * @return "Bearer"
-     */
-    public String getSchemeName() {
-        return "bearer";
-    }
-
-    /**
-     * Processes the Bearer challenge.
-     *  
-     * @param   challenge                   The challenge string
-     * 
-     * @throws MalformedChallengeException  Thrown if the authentication challenge is malformed
-     */
-    public void processChallenge(String challenge) throws MalformedChallengeException {
-        String s = AuthChallengeParser.extractScheme(challenge);
-        if (!s.equalsIgnoreCase(getSchemeName())) {
-            throw new MalformedChallengeException(
-              "Invalid " + getSchemeName() + " challenge: " + challenge); 
-        }
-        mParams = AuthChallengeParser.extractParams(challenge);
-        mComplete = true;
-    }
-
-    /**
-     * Tests if the Bearer authentication process has been completed.
-     * 
-     * @return 'true' if Bearer authorization has been processed, 'false' otherwise.
-     */
-    public boolean isComplete() {
-        return this.mComplete;
-    }
-
-    /**
-     * Produces bearer authorization string for the given set of 
-     * {@link Credentials}.
-     * 
-     * @param   credentials                     The set of credentials to be used for authentication
-     * @param   method                          Method name is ignored by the bearer authentication scheme
-     * @param   uri                             URI is ignored by the bearer authentication scheme
-     * @throws  InvalidCredentialsException     If authentication credentials are not valid or not applicable 
-     *                                          for this authentication scheme
-     * @throws  AuthenticationException         If authorization string cannot be generated due to an authentication failure
-     * @return  A bearer authorization string
-     */
-    public String authenticate(Credentials credentials, String method, String uri) throws AuthenticationException {
-        BearerCredentials bearer;
-        try {
-            bearer = (BearerCredentials) credentials;
-        } catch (ClassCastException e) {
-            throw new InvalidCredentialsException(
-             "Credentials cannot be used for bearer authentication: "
-              + credentials.getClass().getName());
-        }
-        return BearerAuthScheme.authenticate(bearer);
-    }
-
-
-    /**
-     * Returns 'false'. Bearer authentication scheme is request based.
-     *
-     * @return 'false'.
-     */
-    public boolean isConnectionBased() {
-        return false;
-    }
-
-    /**
-     * Produces bearer authorization string for the given set of {@link Credentials}.
-     *
-     * @param   credentials                     The set of credentials to be used for authentication
-     * @param   method                          The method being authenticated
-     * @throws  InvalidCredentialsException     If authentication credentials are not valid or not applicable for this authentication
-     *                                          scheme.
-     * @throws AuthenticationException         If authorization string cannot be generated due to an authentication failure.
-     *
-     * @return a basic authorization string
-     */
-    public String authenticate(Credentials credentials, HttpMethod method) throws AuthenticationException {
-        if (method == null) {
-            throw new IllegalArgumentException("Method may not be null");
-        }
-        BearerCredentials bearer = null;
-        try {
-            bearer = (BearerCredentials) credentials;
-        } catch (ClassCastException e) {
-            throw new InvalidCredentialsException(
-                    "Credentials cannot be used for bearer authentication: "
-                    + credentials.getClass().getName());
-        }
-        return BearerAuthScheme.authenticate(
-            bearer,
-            method.getParams().getCredentialCharset());
-    }
-
-    /**
-     * Returns a bearer Authorization header value for the given
-     * {@link BearerCredentials}.
-     *
-     * @param   credentials     The credentials to encode.
-     *
-     * @return                  A bearer authorization string
-     */
-    public static String authenticate(BearerCredentials credentials) {
-        return authenticate(credentials, "ISO-8859-1");
-    }
-
-    /**
-     * Returns a bearer Authorization header value for the given
-     * {@link BearerCredentials} and charset.
-     * 
-     * @param   credentials         The credentials to encode.
-     * @param   charset             The charset to use for encoding the credentials
-     * 
-     * @return                      A bearer authorization string
-     * 
-     * @since 3.0
-     */
-    public static String authenticate(BearerCredentials credentials, String charset) {
-
-        if (credentials == null) {
-            throw new IllegalArgumentException("Credentials may not be null"); 
-        }
-        if (charset == null || charset.length() == 0) {
-            throw new IllegalArgumentException("charset may not be null or empty");
-        }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(credentials.getAccessToken());
-
-        return "Bearer " + buffer.toString();
-    }
-
-    /**
-     * Returns a String identifying the authentication challenge.  This is
-     * used, in combination with the host and port to determine if
-     * authorization has already been attempted or not.  Schemes which
-     * require multiple requests to complete the authentication should
-     * return a different value for each stage in the request.
-     * 
-     * Additionally, the ID should take into account any changes to the
-     * authentication challenge and return a different value when appropriate.
-     * For example when the realm changes in basic authentication it should be
-     * considered a different authentication attempt and a different value should
-     * be returned.
-     * 
-     * This method simply returns the realm for the challenge.
-     * 
-     * @return String       a String identifying the authentication challenge.
-     */
-    @Override
-    public String getID() {
-        return getRealm();
-    }
-
-    /**
-     * Returns authentication parameter with the given name, if available.
-     * 
-     * @param   name    The name of the parameter to be returned
-     * 
-     * @return          The parameter with the given name
-     */
-    @Override
-    public String getParameter(String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name may not be null"); 
-        }
-        if (mParams == null) {
-            return null;
-        }
-        return (String) mParams.get(name.toLowerCase());
-    }
-
-    /**
-     * Returns authentication realm. The realm may not be null.
-     * 
-     * @return  The authentication realm
-     */
-    @Override
-    public String getRealm() {
-        return getParameter("realm");
-    }
-    
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java
deleted file mode 100644
index 6771a6af..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/BearerCredentials.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-import org.apache.commons.httpclient.util.LangUtils;
-
-/**
- *
- * @author David A. Velasco
- */
-public class BearerCredentials {
-
-    
-    private String mAccessToken;
-    
-    
-    /**
-     * The constructor with the bearer token
-     *
-     * @param token     The bearer token
-     */
-    public BearerCredentials(String token) {
-        /*if (token == null) {
-            throw new IllegalArgumentException("Bearer token may not be null");            
-        }*/
-        mAccessToken = (token == null) ? "" : token;
-    }
-
-
-    /**
-     * Returns the access token
-     *
-     * @return      The access token
-     */
-    public String getAccessToken() {
-        return mAccessToken;
-    }
-
-
-    /**
-     * Get this object string.
-     *
-     * @return  The access token
-     */
-    public String toString() {
-        return mAccessToken;
-    }
-
-    /**
-     * Does a hash of the access token.
-     *
-     * @return The hash code of the access token
-     */
-    public int hashCode() {
-        int hash = LangUtils.HASH_SEED;
-        hash = LangUtils.hashCode(hash, mAccessToken);
-        return hash;
-    }
-
-    /**
-     * These credentials are assumed equal if accessToken is the same.
-     *
-     * @param   o   The other object to compare with.
-     *
-     * @return      'True' if the object is equivalent.
-     */
-    public boolean equals(Object o) {
-        if (o == null) return false;
-        if (this == o) return true;
-        if (this.getClass().equals(o.getClass())) {
-            BearerCredentials that = (BearerCredentials) o;
-            if (LangUtils.equals(mAccessToken, that.mAccessToken)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
-
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java
deleted file mode 100644
index 62b01f33..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ClientConfiguration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-public class OAuth2ClientConfiguration {
-
-    private String mClientId;
-
-    private String mClientSecret;
-
-    private String mRedirectUri;
-
-    public OAuth2ClientConfiguration(String clientId, String clientSecret, String redirectUri) {
-        mClientId = (clientId == null) ? "" : clientId;
-        mClientSecret = (clientSecret == null) ? "" : clientSecret;
-        mRedirectUri = (redirectUri == null) ? "" : redirectUri;
-    }
-
-    public String getClientId() {
-        return mClientId;
-    }
-
-    public String getClientSecret() {
-        return mClientSecret;
-    }
-
-    public String getRedirectUri() {
-        return mRedirectUri;
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java
deleted file mode 100644
index e390e357..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Constants.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-/** 
- * Constant values for OAuth 2 protocol.
- * 
- * Includes required and optional parameter NAMES used in the 'authorization code' grant type.
- */
-
-public class OAuth2Constants {
-    
-    /// Parameters to send to the Authorization Endpoint
-    public static final String KEY_RESPONSE_TYPE = "response_type";
-    public static final String KEY_REDIRECT_URI = "redirect_uri";
-    public static final String KEY_CLIENT_ID = "client_id";
-    public static final String KEY_SCOPE = "scope";
-    public static final String KEY_STATE = "state"; 
-    
-    /// Additional parameters to send to the Token Endpoint
-    public static final String KEY_GRANT_TYPE = "grant_type";
-    public static final String KEY_CODE = "code";
-
-    // Used to get the Access Token using Refresh Token
-    public static final String OAUTH2_REFRESH_TOKEN_GRANT_TYPE = "refresh_token";
-    
-    /// Parameters received in an OK response from the Token Endpoint 
-    public static final String KEY_ACCESS_TOKEN = "access_token";
-    public static final String KEY_TOKEN_TYPE = "token_type";
-    public static final String KEY_EXPIRES_IN = "expires_in";
-    public static final String KEY_REFRESH_TOKEN = "refresh_token";
-    
-    /// Parameters in an ERROR response
-    public static final String KEY_ERROR = "error";
-    public static final String KEY_ERROR_DESCRIPTION = "error_description";
-    public static final String KEY_ERROR_URI = "error_uri";
-    public static final String VALUE_ERROR_ACCESS_DENIED = "access_denied";
-
-    /// Extra not standard
-    public static final String KEY_USER_ID = "user_id";
-
-    /// Depends on oauth2 grant type
-    public static final String OAUTH2_RESPONSE_TYPE_CODE = "code";
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java
deleted file mode 100644
index 4010da2f..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2GrantType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-public enum OAuth2GrantType {
-    AUTHORIZATION_CODE("authorization_code"),
-    IMPLICIT("implicit"),
-    PASSWORD("password"),
-    CLIENT_CREDENTIAL("client_credentials"),
-    REFRESH_TOKEN("refresh_token")  // not a grant type conceptually, but used as such to refresh access tokens
-    ;
-
-    private String mValue;
-
-    OAuth2GrantType(String value) {
-        mValue = value;
-    }
-
-    public String getValue() {
-        return mValue;
-    }
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java
deleted file mode 100644
index f6f7c88a..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2Provider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-public interface OAuth2Provider {
-
-    /**
-     * {@link OAuth2RequestBuilder} implementation for this provider.
-     *
-     * @return      {@link OAuth2RequestBuilder} implementation.
-     */
-    OAuth2RequestBuilder getOperationBuilder();
-
-
-    /**
-     * Set configuration of the client that will use this {@link OAuth2Provider}
-     * @param oAuth2ClientConfiguration     Configuration of the client that will use this {@link OAuth2Provider}
-     */
-    void setClientConfiguration(OAuth2ClientConfiguration oAuth2ClientConfiguration);
-
-    /**
-     * Configuration of the client that is using this {@link OAuth2Provider}
-     * return                   Configuration of the client that is usinng this {@link OAuth2Provider}
-     */
-    OAuth2ClientConfiguration getClientConfiguration();
-
-
-    /**
-     * Set base URI to authorization server.
-     *
-     * @param authorizationServerUri        Set base URL to authorization server.
-     */
-    void setAuthorizationServerUri(String authorizationServerUri);
-
-    /**
-     * base URI to authorization server.
-     *
-     * @return      Base URL to authorization server.
-     */
-    String getAuthorizationServerUri();
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java
deleted file mode 100644
index 11014cf1..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ProvidersRegistry.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class OAuth2ProvidersRegistry {
-
-    private Map<String, OAuth2Provider> mProviders = new HashMap<>();
-
-    private OAuth2Provider mDefaultProvider = null;
-
-    private OAuth2ProvidersRegistry () {
-    }
-
-    /**
-     * See https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom
-     */
-    private static class LazyHolder {
-        private static final OAuth2ProvidersRegistry INSTANCE = new OAuth2ProvidersRegistry();
-    }
-
-    /**
-     * Singleton accesor.
-     *
-     * @return     Singleton isntance of {@link OAuth2ProvidersRegistry}
-     */
-    public static OAuth2ProvidersRegistry getInstance() {
-        return LazyHolder.INSTANCE;
-    }
-
-    /**
-     * Register an {@link OAuth2Provider} with the name passed as parameter.
-     *
-     * @param name              Name to bind 'oAuthProvider' in the registry.
-     * @param oAuth2Provider    An {@link OAuth2Provider} instance to keep in the registry.
-     * @throws IllegalArgumentException if 'name' or 'oAuthProvider' are null.
-     */
-    public void registerProvider(String name, OAuth2Provider oAuth2Provider) {
-        if (name == null) {
-            throw new IllegalArgumentException("Name must not be NULL");
-        }
-        if (oAuth2Provider == null) {
-            throw new IllegalArgumentException("oAuth2Provider must not be NULL");
-        }
-
-        mProviders.put(name, oAuth2Provider);
-        if (mProviders.size() == 1) {
-            mDefaultProvider = oAuth2Provider;
-        }
-    }
-
-    public OAuth2Provider unregisterProvider(String name) {
-        OAuth2Provider unregisteredProvider = mProviders.remove(name);
-        if (mProviders.size() == 0) {
-            mDefaultProvider = null;
-        } else if (unregisteredProvider != null && unregisteredProvider == mDefaultProvider) {
-            mDefaultProvider = mProviders.values().iterator().next();
-        }
-        return unregisteredProvider;
-    }
-
-    /**
-     * Get default {@link OAuth2Provider}.
-     *
-     * @return      Default provider, or NULL if there is no provider.
-     */
-    public OAuth2Provider getProvider() {
-        return mDefaultProvider;
-    }
-
-    /**
-     * Get {@link OAuth2Provider} registered with the name passed as parameter.
-     *
-     * @param name  Name used to register the desired {@link OAuth2Provider}
-     * @return      {@link OAuth2Provider} registered with the name 'name'
-     */
-    public OAuth2Provider getProvider(String name) {
-        return mProviders.get(name);
-    }
-
-    /**
-     * Sets the {@link OAuth2Provider} registered with the name passed as parameter as the default provider
-     *
-     * @param name  Name used to register the {@link OAuth2Provider} to set as default.
-     * @return      {@link OAuth2Provider} set as default, or NULL if no provider was registered with 'name'.
-     */
-    public OAuth2Provider setDefaultProvider(String name) {
-        OAuth2Provider toDefault = mProviders.get(name);
-        if (toDefault != null) {
-            mDefaultProvider = toDefault;
-        }
-        return toDefault;
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java
deleted file mode 100644
index e3fc6a31..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2QueryParser.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-import com.owncloud.android.lib.refactor.Log_OC;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class OAuth2QueryParser {
-
-    private static final String TAG = OAuth2QueryParser.class.getName();
-
-    private Map<String, String> mOAuth2ParsedAuthorizationResponse;
-
-    public OAuth2QueryParser() {
-        mOAuth2ParsedAuthorizationResponse = new HashMap<>();
-    }
-
-    public Map<String, String> parse(String query) {
-        mOAuth2ParsedAuthorizationResponse.clear();
-
-        if (query != null) {
-            String[] pairs = query.split("&");
-            int i = 0;
-            String key = "";
-            String value;
-            while (pairs.length > i) {
-                int j = 0;
-                String[] part = pairs[i].split("=");
-                while (part.length > j) {
-                    String p = part[j];
-                    if (j == 0) {
-                        key = p;
-                    } else if (j == 1) {
-                        value = p;
-                        mOAuth2ParsedAuthorizationResponse.put(key, value);
-                    }
-
-                    Log_OC.v(TAG, "[" + i + "," + j + "] = " + p);
-                    j++;
-                }
-                i++;
-            }
-        }
-
-        return mOAuth2ParsedAuthorizationResponse;
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
deleted file mode 100644
index dc49b525..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2RequestBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-
-public interface OAuth2RequestBuilder {
-
-    enum OAuthRequest {
-        GET_AUTHORIZATION_CODE, CREATE_ACCESS_TOKEN, REFRESH_ACCESS_TOKEN
-    }
-
-    void setRequest(OAuthRequest operation);
-
-    void setGrantType(OAuth2GrantType grantType);
-
-    void setAuthorizationCode(String code);
-
-    void setRefreshToken(String refreshToken);
-
-    RemoteOperation buildOperation();
-
-    String buildUri();
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java
deleted file mode 100644
index 86fb2a24..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OAuth2ResponseParser.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   @author David A. Velasco
- *
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class OAuth2ResponseParser {
-
-    public Map<String, String> parseAccessTokenResult(JSONObject tokenJson) throws JSONException {
-        Map<String, String> resultTokenMap = new HashMap<>();
-
-        if (tokenJson.has(OAuth2Constants.KEY_ACCESS_TOKEN)) {
-            resultTokenMap.put(OAuth2Constants.KEY_ACCESS_TOKEN, tokenJson.
-                getString(OAuth2Constants.KEY_ACCESS_TOKEN));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_TOKEN_TYPE)) {
-            resultTokenMap.put(OAuth2Constants.KEY_TOKEN_TYPE, tokenJson.
-                getString(OAuth2Constants.KEY_TOKEN_TYPE));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_EXPIRES_IN)) {
-            resultTokenMap.put(OAuth2Constants.KEY_EXPIRES_IN, tokenJson.
-                getString(OAuth2Constants.KEY_EXPIRES_IN));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_REFRESH_TOKEN)) {
-            resultTokenMap.put(OAuth2Constants.KEY_REFRESH_TOKEN, tokenJson.
-                getString(OAuth2Constants.KEY_REFRESH_TOKEN));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_SCOPE)) {
-            resultTokenMap.put(OAuth2Constants.KEY_SCOPE, tokenJson.
-                getString(OAuth2Constants.KEY_SCOPE));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_ERROR)) {
-            resultTokenMap.put(OAuth2Constants.KEY_ERROR, tokenJson.
-                getString(OAuth2Constants.KEY_ERROR));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_ERROR_DESCRIPTION)) {
-            resultTokenMap.put(OAuth2Constants.KEY_ERROR_DESCRIPTION, tokenJson.
-                getString(OAuth2Constants.KEY_ERROR_DESCRIPTION));
-        }
-        if (tokenJson.has(OAuth2Constants.KEY_ERROR_URI)) {
-            resultTokenMap.put(OAuth2Constants.KEY_ERROR_URI, tokenJson.
-                getString(OAuth2Constants.KEY_ERROR_URI));
-        }
-
-        if (tokenJson.has(OAuth2Constants.KEY_USER_ID)) {   // not standard
-            resultTokenMap.put(OAuth2Constants.KEY_USER_ID, tokenJson.
-                getString(OAuth2Constants.KEY_USER_ID));
-        }
-
-        return resultTokenMap;
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java
deleted file mode 100644
index a7a41e94..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2Provider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-import com.owncloud.android.lib.refactor.Log_OC;
-
-public class OwnCloudOAuth2Provider implements OAuth2Provider {
-
-    public static final String NAME = OAuth2Provider.class.getName();
-
-    public static final String ACCESS_TOKEN_ENDPOINT_PATH = "index.php/apps/oauth2/api/v1/token";
-    private static final String AUTHORIZATION_CODE_ENDPOINT_PATH = "index.php/apps/oauth2/authorize";
-
-    private String mAuthorizationServerUrl = "";
-    private String mAccessTokenEndpointPath = ACCESS_TOKEN_ENDPOINT_PATH;
-    private String mAuthorizationCodeEndpointPath = AUTHORIZATION_CODE_ENDPOINT_PATH;
-
-    private OAuth2ClientConfiguration mClientConfiguration;
-
-    @Override
-    public OAuth2RequestBuilder getOperationBuilder() {
-        return new OwnCloudOAuth2RequestBuilder(this);
-    }
-
-    @Override
-    public void setClientConfiguration(OAuth2ClientConfiguration oAuth2ClientConfiguration) {
-        mClientConfiguration = oAuth2ClientConfiguration;
-    }
-
-    @Override
-    public OAuth2ClientConfiguration getClientConfiguration() {
-        return mClientConfiguration;
-    }
-
-    @Override
-    public void setAuthorizationServerUri(String authorizationServerUri) {
-        mAuthorizationServerUrl = authorizationServerUri;
-    }
-
-    @Override
-    public String getAuthorizationServerUri() {
-        return mAuthorizationServerUrl;
-    }
-
-    public String getAccessTokenEndpointPath() {
-        return mAccessTokenEndpointPath;
-    }
-
-    public void setAccessTokenEndpointPath(String accessTokenEndpointPath) {
-        if (accessTokenEndpointPath == null || accessTokenEndpointPath.length() <= 0) {
-            Log_OC.w(NAME, "Setting invalid access token endpoint path, going on with default");
-            mAccessTokenEndpointPath = ACCESS_TOKEN_ENDPOINT_PATH;
-        } else {
-            mAccessTokenEndpointPath = accessTokenEndpointPath;
-        }
-    }
-
-    public String getAuthorizationCodeEndpointPath() {
-        return mAuthorizationCodeEndpointPath;
-    }
-
-    public void setAuthorizationCodeEndpointPath(String authorizationCodeEndpointPath) {
-        if (authorizationCodeEndpointPath == null || authorizationCodeEndpointPath.length() <= 0) {
-            Log_OC.w(NAME, "Setting invalid authorization code endpoint path, going on with default");
-            mAuthorizationCodeEndpointPath = AUTHORIZATION_CODE_ENDPOINT_PATH;
-        } else {
-            mAuthorizationCodeEndpointPath = authorizationCodeEndpointPath;
-        }
-    }
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
deleted file mode 100644
index 6a458149..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth;
-
-import android.net.Uri;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2GetAccessTokenOperation;
-import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2RefreshAccessTokenOperation;
-
-public class OwnCloudOAuth2RequestBuilder implements OAuth2RequestBuilder {
-
-    private OCContext ocContext;
-    private OwnCloudOAuth2Provider mOAuth2Provider;
-
-    private OAuthRequest mRequest;
-    private OAuth2GrantType mGrantType = OAuth2GrantType.AUTHORIZATION_CODE;
-    private String mCode;
-    private String mRefreshToken;
-
-    public OwnCloudOAuth2RequestBuilder(OwnCloudOAuth2Provider ownCloudOAuth2Provider) {
-        mOAuth2Provider = ownCloudOAuth2Provider;
-    }
-
-    @Override
-    public void setRequest(OAuthRequest request) {
-        mRequest = request;
-    }
-
-    @Override
-    public void setGrantType(OAuth2GrantType grantType) {
-        mGrantType = grantType;
-    }
-
-    @Override
-    public void setAuthorizationCode(String code) {
-        mCode = code;
-    }
-
-    @Override
-    public void setRefreshToken(String refreshToken) {
-        mRefreshToken = refreshToken;
-    }
-
-    public void setOcContext(OCContext ocContext) {
-        this.ocContext = ocContext;
-    }
-
-    @Override
-    public RemoteOperation buildOperation() {
-        if (mGrantType != OAuth2GrantType.AUTHORIZATION_CODE &&
-                mGrantType != OAuth2GrantType.REFRESH_TOKEN) {
-            throw new UnsupportedOperationException(
-                    "Unsupported grant type. Only " +
-                            OAuth2GrantType.AUTHORIZATION_CODE.getValue() + " and " +
-                            OAuth2GrantType.REFRESH_TOKEN + " are supported");
-        }
-        OAuth2ClientConfiguration clientConfiguration = mOAuth2Provider.getClientConfiguration();
-
-        switch(mRequest) {
-            case CREATE_ACCESS_TOKEN:
-                return new OAuth2GetAccessTokenOperation(
-                        ocContext,
-                        mGrantType.getValue(),
-                        mCode,
-                        clientConfiguration.getClientId(),
-                        clientConfiguration.getRedirectUri(),
-                        mOAuth2Provider.getAccessTokenEndpointPath());
-
-            case REFRESH_ACCESS_TOKEN:
-                return new OAuth2RefreshAccessTokenOperation(
-                        ocContext,
-                        clientConfiguration.getClientId(),
-                        mRefreshToken,
-                        mOAuth2Provider.getAccessTokenEndpointPath());
-            default:
-                throw new UnsupportedOperationException("Unsupported request");
-        }
-    }
-
-    @Override
-    public String buildUri() {
-        if (OAuth2GrantType.AUTHORIZATION_CODE != mGrantType) {
-            throw new UnsupportedOperationException(
-                    "Unsupported grant type. Only " +
-                            OAuth2GrantType.AUTHORIZATION_CODE.getValue() + " is supported by this provider"
-            );
-        }
-        OAuth2ClientConfiguration clientConfiguration = mOAuth2Provider.getClientConfiguration();
-        Uri uri;
-        Uri.Builder uriBuilder;
-        switch(mRequest) {
-            case GET_AUTHORIZATION_CODE:
-                uri = Uri.parse(mOAuth2Provider.getAuthorizationServerUri());
-                uriBuilder = uri.buildUpon();
-                uriBuilder.appendEncodedPath(mOAuth2Provider.getAuthorizationCodeEndpointPath());
-                uriBuilder.appendQueryParameter(
-                        OAuth2Constants.KEY_RESPONSE_TYPE, OAuth2Constants.OAUTH2_RESPONSE_TYPE_CODE);
-                uriBuilder.appendQueryParameter(
-                        OAuth2Constants.KEY_REDIRECT_URI, clientConfiguration.getRedirectUri());
-                uriBuilder.appendQueryParameter(
-                        OAuth2Constants.KEY_CLIENT_ID, clientConfiguration.getClientId());
-
-                uri = uriBuilder.build();
-                return uri.toString();
-
-            case CREATE_ACCESS_TOKEN:
-                uri = Uri.parse(mOAuth2Provider.getAuthorizationServerUri());
-                uriBuilder = uri.buildUpon();
-                uriBuilder.appendEncodedPath(mOAuth2Provider.getAccessTokenEndpointPath());
-                uriBuilder.appendQueryParameter(
-                        OAuth2Constants.KEY_RESPONSE_TYPE, OAuth2Constants.OAUTH2_RESPONSE_TYPE_CODE);
-                uriBuilder.appendQueryParameter(
-                        OAuth2Constants.KEY_REDIRECT_URI, clientConfiguration.getRedirectUri());
-                uriBuilder.appendQueryParameter(
-                        OAuth2Constants.KEY_CLIENT_ID, clientConfiguration.getClientId());
-
-                uri = uriBuilder.build();
-                return uri.toString();
-
-            default:
-                throw new UnsupportedOperationException("Unsupported request");
-        }
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
deleted file mode 100644
index 0edaeacb..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *
- *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth.operations;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperationResult;
-import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
-import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
-import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Provider;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-
-import org.json.JSONObject;
-
-import java.util.Map;
-
-import okhttp3.MultipartBody;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-
-public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, String>> {
-    
-    private final String mGrantType;
-    private final String mCode;
-    private final String mClientId;
-    private final String mRedirectUri;
-    private final String mAccessTokenEndpointPath;
-    private final OAuth2ResponseParser mResponseParser;
-
-    public OAuth2GetAccessTokenOperation(
-            OCContext context,
-            String grantType,
-            String code,
-            String clientId,
-            String redirectUri,
-            String accessTokenEndpointPath) {
-        super(context);
-        mClientId = clientId;
-        mRedirectUri = redirectUri;
-        mGrantType = grantType;
-        mCode = code;
-
-        mAccessTokenEndpointPath =
-            accessTokenEndpointPath != null
-                    ? accessTokenEndpointPath
-                    : OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH;
-
-        mResponseParser = new OAuth2ResponseParser();
-    }
-
-    @Override
-    public Result exec() {
-        try {
-            final RequestBody requestBody = new MultipartBody.Builder()
-                    .setType(MultipartBody.FORM)
-                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE, mGrantType)
-                    .addFormDataPart(OAuth2Constants.KEY_CODE, mCode)
-                    .addFormDataPart(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri)
-                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
-                    .build();
-
-            final Request request = getRequestBuilder()
-                    .url(getHttpUrl(mAccessTokenEndpointPath))
-                    .method("POST", requestBody)
-                    .build();
-
-            final Response response = getClient()
-                    .newCall(request)
-                    .execute();
-
-            final String responseData = response.body().string();
-            
-            if (responseData != null && responseData.length() > 0) {
-                final JSONObject tokenJson = new JSONObject(responseData);
-                final Map<String, String> accessTokenResult =
-                    mResponseParser.parseAccessTokenResult(tokenJson);
-
-                return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
-                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
-                        ? new Result(RemoteOperationResult.ResultCode.OAUTH2_ERROR)
-                        : new Result(true, request, response, accessTokenResult);
-            } else {
-                return new Result(false, request, response);
-            }
-
-        } catch (Exception e) {
-            return new Result(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
deleted file mode 100644
index 9453f613..00000000
--- a/src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2RefreshAccessTokenOperation.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   @author David González Verdugo
- *
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.lib.refactor.authentication.oauth.operations;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperationResult;
-import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
-import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
-import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
-import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Provider;
-
-import org.json.JSONObject;
-
-import java.util.Map;
-
-import okhttp3.MultipartBody;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<String, String>> {
-
-    private static final String TAG = OAuth2RefreshAccessTokenOperation.class.getSimpleName();
-
-    private final String mClientId;
-    private final String mRefreshToken;
-    private final String mAccessTokenEndpointPath;
-    private final OAuth2ResponseParser mResponseParser;
-
-    public OAuth2RefreshAccessTokenOperation(
-            OCContext ocContext,
-            String clientId,
-            String refreshToken,
-            String accessTokenEndpointPath
-    ) {
-        super(ocContext);
-
-        mClientId = clientId;
-        mRefreshToken = refreshToken;
-
-        mAccessTokenEndpointPath =
-                accessTokenEndpointPath != null ?
-                        accessTokenEndpointPath :
-                        OwnCloudOAuth2Provider.ACCESS_TOKEN_ENDPOINT_PATH;
-
-        mResponseParser = new OAuth2ResponseParser();
-    }
-
-    @Override
-    public Result exec() {
-        try {
-            final RequestBody requestBody = new MultipartBody.Builder()
-                    .setType(MultipartBody.FORM)
-                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE,
-                            OAuth2GrantType.REFRESH_TOKEN.getValue())
-                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
-                    .addFormDataPart(OAuth2Constants.KEY_REFRESH_TOKEN, mRefreshToken)
-                    .build();
-
-            final Request request = getRequestBuilder()
-                    .url(getHttpUrl(mAccessTokenEndpointPath))
-                    .method("POST", requestBody)
-                    .build();
-
-            final Response response = getClient().newCall(request).execute();
-
-            final String responseData = response.body().string();
-            Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + responseData);
-
-            if (responseData != null && responseData.length() > 0) {
-                final JSONObject tokenJson = new JSONObject(responseData);
-                final Map<String, String> accessTokenResult =
-                    mResponseParser.parseAccessTokenResult(tokenJson);
-                return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
-                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
-                    ? new Result(RemoteOperationResult.ResultCode.OAUTH2_ERROR)
-                    : new Result(true, request, response, accessTokenResult);
-
-            } else {
-                return new Result(false, request, response);
-            }
-
-        } catch (Exception e) {
-            return new Result(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java b/src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java
deleted file mode 100644
index fd1bfd6c..00000000
--- a/src/com/owncloud/android/lib/refactor/exceptions/AccountNotFoundException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.owncloud.android.lib.refactor.exceptions;
-
-import android.accounts.Account;
-import android.accounts.AccountsException;
-
-public class AccountNotFoundException extends AccountsException {
-
-    /**
-     * Generated - should be refreshed every time the class changes!!
-     */
-    private static final long serialVersionUID = -1684392454778508693L;
-
-    private Account mFailedAccount;
-
-    public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {
-        super(message, cause);
-        mFailedAccount = failedAccount;
-    }
-
-    public Account getFailedAccount() {
-        return mFailedAccount;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java b/src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java
deleted file mode 100644
index 7582bb0f..00000000
--- a/src/com/owncloud/android/lib/refactor/exceptions/CertificateCombinedException.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.exceptions;
-
-import com.owncloud.android.lib.common.network.AdvancedSslSocketFactory;
-import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
-
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
-
-/**
- * Exception joining all the problems that {@link AdvancedX509TrustManager} can find in
- * a certificate chain for a server.
- * 
- * This was initially created as an extension of CertificateException, but some
- * implementations of the SSL socket layer in existing devices are REPLACING the CertificateException
- * instances thrown by {@link javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[], String)}
- * with SSLPeerUnverifiedException FORGETTING THE CAUSING EXCEPTION instead of wrapping it. 
- * 
- * Due to this, extending RuntimeException is necessary to get that the CertificateCombinedException 
- * instance reaches {@link AdvancedSslSocketFactory#verifyPeerIdentity}.
- * 
- * BE CAREFUL. As a RuntimeException extensions, Java compilers do not require to handle it
- * in client methods. Be sure to use it only when you know exactly where it will go.
- * 
- * @author David A. Velasco
- */
-public class CertificateCombinedException extends RuntimeException {
-
-    /** Generated - to refresh every time the class changes */
-    private static final long serialVersionUID = -8875782030758554999L;
-    
-    private X509Certificate mServerCert = null;
-    private String mHostInUrl;
-
-    private CertificateExpiredException mCertificateExpiredException = null;
-    private CertificateNotYetValidException mCertificateNotYetValidException = null;
-    private CertPathValidatorException mCertPathValidatorException = null;
-    private CertificateException mOtherCertificateException = null;
-    private SSLPeerUnverifiedException mSslPeerUnverifiedException = null;
-    
-    public CertificateCombinedException(X509Certificate x509Certificate) {
-        mServerCert = x509Certificate;
-    }
-
-    public X509Certificate getServerCertificate() {
-        return mServerCert;
-    }
-
-    public String getHostInUrl() {
-        return mHostInUrl;
-    }
-
-    public void setHostInUrl(String host) {
-        mHostInUrl = host;
-    }
-
-    public CertificateExpiredException getCertificateExpiredException() {
-        return mCertificateExpiredException;
-    }
-
-    public void setCertificateExpiredException(CertificateExpiredException c) {
-        mCertificateExpiredException  = c;
-    }
-
-    public CertificateNotYetValidException getCertificateNotYetValidException() {
-        return mCertificateNotYetValidException;
-    }
-
-    public void setCertificateNotYetException(CertificateNotYetValidException c) {
-        mCertificateNotYetValidException = c;
-    }
-
-    public CertPathValidatorException getCertPathValidatorException() {
-        return mCertPathValidatorException;
-    }
-
-    public void setCertPathValidatorException(CertPathValidatorException c) {
-        mCertPathValidatorException = c;
-    }
-
-    public CertificateException getOtherCertificateException() {
-        return mOtherCertificateException;
-    }
-
-    public void setOtherCertificateException(CertificateException c) {
-        mOtherCertificateException = c;
-    }
-
-    public SSLPeerUnverifiedException getSslPeerUnverifiedException() {
-        return mSslPeerUnverifiedException ; 
-    }
-
-    public void setSslPeerUnverifiedException(SSLPeerUnverifiedException s) {
-        mSslPeerUnverifiedException = s;
-    }
-
-    public boolean isException() {
-        return (mCertificateExpiredException != null ||
-                mCertificateNotYetValidException != null ||
-                mCertPathValidatorException != null ||
-                mOtherCertificateException != null ||
-                mSslPeerUnverifiedException != null);
-    }
-
-    public boolean isRecoverable() {
-        return (mCertificateExpiredException != null ||
-                mCertificateNotYetValidException != null ||
-                mCertPathValidatorException != null ||
-                mSslPeerUnverifiedException != null);
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java b/src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java
deleted file mode 100644
index 27a5ede6..00000000
--- a/src/com/owncloud/android/lib/refactor/exceptions/OperationCancelledException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.exceptions;
-
-public class OperationCancelledException extends Exception {
-
-    /**
-     * Generated serial version - to avoid Java warning
-     */
-    private static final long serialVersionUID = -6350981497740424983L;
-
-}
diff --git a/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
deleted file mode 100644
index 99fe0713..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/RemoteOperation.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.owncloud.android.lib.refactor.operations;
-import android.net.Uri;
-
-import com.owncloud.android.lib.refactor.OCContext;
-
-import java.io.IOException;
-import java.util.Map;
-
-import at.bitfire.dav4android.UrlUtils;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public abstract class RemoteOperation<I extends Object> {
-    private final OCContext mContext;
-    // TODO Move to a constants file
-    private static final String USER_AGENT_HEADER = "User-Agent";
-    public static final String WEBDAV_PATH_4_0 = "remote.php/dav/files";
-    private static OkHttpClient mClient = null;
-
-
-    public class Result extends RemoteOperationResult {
-        public Result(ResultCode code) {
-            this(code, null);
-        }
-
-        public Result(ResultCode code, I data) {
-            super(code);
-            mData = data;
-        }
-
-        public Result(Exception e) {
-            super(e);
-            mData = null;
-        }
-
-        public Result(boolean success, Request request, Response response) throws IOException {
-            this(success, request, response, null);;
-        }
-
-        public Result(boolean success, Request request, Response response, I data) throws IOException {
-            super(success, request, response);
-            mData = data;
-        }
-
-        private final I mData;
-
-        public I getData() {
-            return mData;
-        }
-    }
-
-
-    protected RemoteOperation(OCContext ocContext) {
-        mContext = ocContext;
-        if(mClient == null) {
-            mClient = new OkHttpClient.Builder()
-                    .followRedirects(false)
-                    .build();
-        }
-    }
-
-    public abstract Result exec();
-
-    protected OCContext getOCContext() {
-        return mContext;
-    }
-
-    protected OkHttpClient getClient() {
-        return mClient.newBuilder()
-                .addInterceptor(chain ->
-                        chain.proceed(
-                                addRequestCredentials(chain.request())
-                                        .addHeader(USER_AGENT_HEADER, mContext.getUserAgent())
-                                        .build()
-                        )
-                )
-                .followRedirects(false)
-                .build();
-    }
-
-    private Uri.Builder getBaseUriBuilder() {
-        return mContext.getOCAccount().getBaseUri().buildUpon();
-    }
-
-    protected HttpUrl getHttpUrl(String endpointPath) {
-        return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse(
-                getBaseUriBuilder()
-                        .appendEncodedPath(endpointPath)
-                        .build()
-                        .toString()));
-    }
-
-    protected HttpUrl getWebDavHttpUrl(String resourcePath) {
-        return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse(
-                getBaseUriBuilder()
-                        .appendEncodedPath(WEBDAV_PATH_4_0)
-                        .appendEncodedPath(mContext.getOCAccount().getDisplayName())
-                        .appendEncodedPath(resourcePath)
-                        .build()
-                        .toString()));
-    }
-
-    protected Request.Builder getRequestBuilder() {
-        return new Request.Builder();
-    }
-
-    private Request.Builder addRequestCredentials(Request request) {
-        Request.Builder builder =  request.newBuilder();
-
-        for(Map.Entry<String, String> header : mContext.getOCAccount()
-                .getCredentials()
-                .getCredentialHeaders()
-                .entrySet()) {
-            builder.addHeader(header.getKey(), header.getValue());
-        }
-
-        //TODO: Remove this part once SAML is obsolet
-        final String credentialCookie = mContext
-                .getOCAccount()
-                .getCredentials()
-                .getCredentialCookie();
-        if(credentialCookie != null) {
-            System.err.println(credentialCookie);
-            builder.addHeader("Cookie", credentialCookie);
-        }
-
-        return builder;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java
deleted file mode 100644
index 87570a90..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/RemoteOperationResult.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.operations;
-
-import android.accounts.Account;
-import android.accounts.AccountsException;
-
-import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
-import com.owncloud.android.lib.refactor.exceptions.CertificateCombinedException;
-import com.owncloud.android.lib.refactor.exceptions.OperationCancelledException;
-import com.owncloud.android.lib.refactor.utils.ErrorMessageParser;
-import com.owncloud.android.lib.refactor.utils.InvalidCharacterExceptionParser;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.json.JSONException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.SSLException;
-
-import at.bitfire.dav4android.exception.ConflictException;
-import at.bitfire.dav4android.exception.DavException;
-import at.bitfire.dav4android.exception.HttpException;
-import at.bitfire.dav4android.exception.InvalidDavResponseException;
-import at.bitfire.dav4android.exception.NotFoundException;
-import at.bitfire.dav4android.exception.PreconditionFailedException;
-import at.bitfire.dav4android.exception.ServiceUnavailableException;
-import at.bitfire.dav4android.exception.UnauthorizedException;
-import at.bitfire.dav4android.exception.UnsupportedDavException;
-import okhttp3.Headers;
-import okhttp3.Request;
-import okhttp3.Response;
-
-
-/**
- * The result of a remote operation required to an ownCloud server.
- * <p/>
- * Provides a common classification of remote operation results for all the
- * application.
- *
- * @author David A. Velasco
- */
-public abstract class RemoteOperationResult implements Serializable {
-
-    /**
-     * Generated - should be refreshed every time the class changes!!
-     */
-    private static final long serialVersionUID = 4968939884332652230L;
-
-    private static final String TAG = RemoteOperationResult.class.getSimpleName();
-
-
-    public enum ResultCode {
-        OK,
-        OK_SSL,
-        OK_NO_SSL,
-        UNHANDLED_HTTP_CODE,
-        UNAUTHORIZED,
-        FILE_NOT_FOUND,
-        INSTANCE_NOT_CONFIGURED,
-        UNKNOWN_ERROR,
-        WRONG_CONNECTION,
-        TIMEOUT,
-        INCORRECT_ADDRESS,
-        HOST_NOT_AVAILABLE,
-        NO_NETWORK_CONNECTION,
-        SSL_ERROR,
-        SSL_RECOVERABLE_PEER_UNVERIFIED,
-        BAD_OC_VERSION,
-        CANCELLED,
-        INVALID_LOCAL_FILE_NAME,
-        INVALID_OVERWRITE,
-        CONFLICT,
-        OAUTH2_ERROR,
-        SYNC_CONFLICT,
-        LOCAL_STORAGE_FULL,
-        LOCAL_STORAGE_NOT_MOVED,
-        LOCAL_STORAGE_NOT_COPIED,
-        OAUTH2_ERROR_ACCESS_DENIED,
-        QUOTA_EXCEEDED,
-        ACCOUNT_NOT_FOUND,
-        ACCOUNT_EXCEPTION,
-        ACCOUNT_NOT_NEW,
-        ACCOUNT_NOT_THE_SAME,
-        INVALID_CHARACTER_IN_NAME,
-        SHARE_NOT_FOUND,
-        LOCAL_STORAGE_NOT_REMOVED,
-        FORBIDDEN,
-        SHARE_FORBIDDEN,
-        SPECIFIC_FORBIDDEN,
-        OK_REDIRECT_TO_NON_SECURE_CONNECTION,
-        INVALID_MOVE_INTO_DESCENDANT,
-        INVALID_COPY_INTO_DESCENDANT,
-        PARTIAL_MOVE_DONE,
-        PARTIAL_COPY_DONE,
-        SHARE_WRONG_PARAMETER,
-        WRONG_SERVER_RESPONSE,
-        INVALID_CHARACTER_DETECT_IN_SERVER,
-        DELAYED_FOR_WIFI,
-        LOCAL_FILE_NOT_FOUND,
-        SERVICE_UNAVAILABLE,
-        SPECIFIC_SERVICE_UNAVAILABLE,
-        SPECIFIC_UNSUPPORTED_MEDIA_TYPE
-    }
-
-    private boolean mSuccess = false;
-    private int mHttpCode = -1;
-    private String mHttpPhrase = null;
-    private Exception mException = null;
-    private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
-    private String mRedirectedLocation;
-    private ArrayList<String> mAuthenticate = new ArrayList<>();
-    private String mLastPermanentLocation = null;
-
-    /**
-     * Public constructor from result code.
-     *
-     * To be used when the caller takes the responsibility of interpreting the result of a {@link RemoteOperation}
-     *
-     * @param code {@link ResultCode} decided by the caller.
-     */
-    public RemoteOperationResult(ResultCode code) {
-        mCode = code;
-        mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL ||
-                code == ResultCode.OK_NO_SSL ||
-                code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION);
-    }
-
-    /**
-     * Public constructor from exception.
-     *
-     * To be used when an exception prevented the end of the {@link RemoteOperation}.
-     *
-     * Determines a {@link ResultCode} depending on the type of the exception.
-     *
-     * @param e Exception that interrupted the {@link RemoteOperation}
-     */
-    public RemoteOperationResult(Exception e) {
-        if (e instanceof SSLException || e instanceof RuntimeException) {
-            CertificateCombinedException se = getCertificateCombinedException(e);
-            mException = se;
-        } else {
-            mException = e;
-        }
-
-        mCode = getResultCodeByException(e);
-    }
-
-    private ResultCode getResultCodeByException(Exception e) {
-        return (e instanceof UnauthorizedException) ? ResultCode.UNAUTHORIZED
-                : (e instanceof NotFoundException) ? ResultCode.FILE_NOT_FOUND
-                : (e instanceof ConflictException) ? ResultCode.CONFLICT
-                : (e instanceof PreconditionFailedException) ? ResultCode.UNKNOWN_ERROR
-                : (e instanceof ServiceUnavailableException) ? ResultCode.SERVICE_UNAVAILABLE
-                : (e instanceof HttpException) ? ResultCode.UNHANDLED_HTTP_CODE
-                : (e instanceof InvalidDavResponseException) ? ResultCode.UNKNOWN_ERROR
-                : (e instanceof UnsupportedDavException) ? ResultCode.UNKNOWN_ERROR
-                : (e instanceof DavException) ? ResultCode.UNKNOWN_ERROR
-                : (e instanceof SSLException || e instanceof RuntimeException) ? handleSSLException(e)
-                : (e instanceof SocketException) ? ResultCode.WRONG_CONNECTION
-                : (e instanceof SocketTimeoutException) ? ResultCode.TIMEOUT
-                : (e instanceof MalformedURLException) ? ResultCode.INCORRECT_ADDRESS
-                : (e instanceof UnknownHostException) ? ResultCode.HOST_NOT_AVAILABLE
-                : ResultCode.UNKNOWN_ERROR;
-    }
-
-    private ResultCode handleSSLException(Exception e) {
-        final CertificateCombinedException se = getCertificateCombinedException(e);
-        return (se != null && se.isRecoverable()) ? ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED
-                : (e instanceof RuntimeException) ? ResultCode.HOST_NOT_AVAILABLE
-                : ResultCode.SSL_ERROR;
-    }
-
-    /**
-     * Public constructor from separate elements of an HTTP or DAV response.
-     *
-     * To be used when the result needs to be interpreted from the response of an HTTP/DAV method.
-     *
-     * Determines a {@link ResultCode} from the already executed method received as a parameter. Generally,
-     * will depend on the HTTP code and HTTP response headers received. In some cases will inspect also the
-     * response body
-     *
-     * @param success
-     * @param request
-     * @param response
-     * @throws IOException
-     */
-    public RemoteOperationResult(boolean success, Request request, Response response) throws IOException {
-        this(success, response.code(), HttpStatus.getStatusText(response.code()), response.headers());
-
-        if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
-
-            String bodyResponse = response.body().string();
-            // do not get for other HTTP codes!; could not be available
-
-            if (bodyResponse != null && bodyResponse.length() > 0) {
-                InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
-                InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
-                try {
-                    if (xmlParser.parseXMLResponse(is)) {
-                        mCode = ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER;
-                    }
-
-                } catch (Exception e) {
-                    Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
-                    // mCode stays as set in this(success, httpCode, headers)
-                }
-            }
-        }
-
-        // before
-        switch (mHttpCode) {
-            case HttpStatus.SC_FORBIDDEN:
-                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_FORBIDDEN);
-                break;
-            case HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE:
-                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE);
-                break;
-            case HttpStatus.SC_SERVICE_UNAVAILABLE:
-                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_SERVICE_UNAVAILABLE);
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Parse the error message included in the body response, if any, and set the specific result
-     * code
-     */
-
-    /**
-     * Parse the error message included in the body response, if any, and set the specific result
-     * code
-     *
-     * @param request okHttp request
-     * @param response okHttp respnse
-     * @param resultCode our own custom result code
-     * @throws IOException
-     */
-    private void parseErrorMessageAndSetCode(Request request, Response response, ResultCode resultCode)
-            throws IOException {
-
-        String bodyResponse = response.body().string();
-
-        if (bodyResponse != null && bodyResponse.length() > 0) {
-            InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
-            ErrorMessageParser xmlParser = new ErrorMessageParser();
-            try {
-                String errorMessage = xmlParser.parseXMLResponse(is);
-                if (errorMessage != "" && errorMessage != null) {
-                    mCode = resultCode;
-                    mHttpPhrase = errorMessage;
-                }
-            } catch (Exception e) {
-                Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
-                // mCode stays as set in this(success, httpCode, headers)
-            }
-        }
-    }
-
-    /**
-     * Public constructor from separate elements of an HTTP or DAV response.
-     *
-     * To be used when the result needs to be interpreted from HTTP response elements that could come from
-     * different requests (WARNING: black magic, try to avoid).
-     *
-     * Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
-     *
-     * @param success     The operation was considered successful or not.
-     * @param httpCode    HTTP status code returned by an HTTP/DAV method.
-     * @param httpPhrase  HTTP status line phrase returned by an HTTP/DAV method
-     * @param headers     HTTP response header returned by an HTTP/DAV method
-     */
-    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Headers headers) {
-        this(success, httpCode, httpPhrase);
-        for (Map.Entry<String, List<String>> header : headers.toMultimap().entrySet()) {
-            if ("location".equals(header.getKey().toLowerCase())) {
-                mRedirectedLocation = header.getValue().get(0);
-                continue;
-            }
-            if ("www-authenticate".equals(header.getKey().toLowerCase())) {
-                mAuthenticate.add(header.getValue().get(0).toLowerCase());
-            }
-        }
-        if (isIdPRedirection()) {
-            mCode = ResultCode.UNAUTHORIZED;    // overrides default ResultCode.UNKNOWN
-        }
-    }
-
-    /**
-     * Private constructor for results built interpreting a HTTP or DAV response.
-     *
-     * Determines a {@link ResultCode} depending of the type of the exception.
-     *
-     * @param success    Operation was successful or not.
-     * @param httpCode   HTTP status code returned by the HTTP/DAV method.
-     * @param httpPhrase HTTP status line phrase returned by the HTTP/DAV method
-     */
-    private RemoteOperationResult(boolean success, int httpCode, String httpPhrase) {
-        mSuccess = success;
-        mHttpCode = httpCode;
-        mHttpPhrase = httpPhrase;
-        mCode = success
-                ? ResultCode.OK
-                : getCodeFromStatus(httpCode);
-    }
-
-    private ResultCode getCodeFromStatus(int status) {
-        switch (status) {
-            case HttpStatus.SC_UNAUTHORIZED: return ResultCode.UNAUTHORIZED;
-            case HttpStatus.SC_FORBIDDEN: return ResultCode.FORBIDDEN;
-            case HttpStatus.SC_NOT_FOUND: return ResultCode.FILE_NOT_FOUND;
-            case HttpStatus.SC_CONFLICT: return ResultCode.CONFLICT;
-            case HttpStatus.SC_INTERNAL_SERVER_ERROR: return ResultCode.INSTANCE_NOT_CONFIGURED;
-            case HttpStatus.SC_SERVICE_UNAVAILABLE: return ResultCode.SERVICE_UNAVAILABLE;
-            case HttpStatus.SC_INSUFFICIENT_STORAGE: return ResultCode.QUOTA_EXCEEDED;
-            default:
-                Log_OC.d(TAG,
-                        "RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " +
-                                mHttpCode + " " + mHttpPhrase
-                );
-                return ResultCode.UNHANDLED_HTTP_CODE;
-        }
-    }
-
-    public boolean isSuccess() {
-        return mSuccess;
-    }
-
-    public boolean isCancelled() {
-        return mCode == ResultCode.CANCELLED;
-    }
-
-    public int getHttpCode() {
-        return mHttpCode;
-    }
-
-    public String getHttpPhrase() {
-        return mHttpPhrase;
-    }
-
-    public ResultCode getCode() {
-        return mCode;
-    }
-
-    public Exception getException() {
-        return mException;
-    }
-
-    public boolean isSslRecoverableException() {
-        return mCode == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
-    }
-
-    public boolean isRedirectToNonSecureConnection() {
-        return mCode == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION;
-    }
-
-    private CertificateCombinedException getCertificateCombinedException(Exception e) {
-        CertificateCombinedException result = null;
-        if (e instanceof CertificateCombinedException) {
-            return (CertificateCombinedException) e;
-        }
-        Throwable cause = mException.getCause();
-        Throwable previousCause = null;
-        while (cause != null && cause != previousCause &&
-                !(cause instanceof CertificateCombinedException)) {
-            previousCause = cause;
-            cause = cause.getCause();
-        }
-        return (cause != null && cause instanceof CertificateCombinedException)
-                ? (CertificateCombinedException) cause
-                : result;
-    }
-
-    public String getLogMessage() {
-
-        if (mException != null) {
-            return (mException instanceof OperationCancelledException)
-                    ? "Operation cancelled by the caller"
-                    : (mException instanceof SocketException) ? "Socket exception"
-                    : (mException instanceof SocketTimeoutException) ? "Socket timeout exception"
-                    : (mException instanceof MalformedURLException) ? "Malformed URL exception"
-                    : (mException instanceof UnknownHostException) ? "Unknown host exception"
-                    : (mException instanceof CertificateCombinedException) ?
-                        (((CertificateCombinedException) mException).isRecoverable()
-                                ? "SSL recoverable exception"
-                                : "SSL exception")
-                    : (mException instanceof SSLException) ? "SSL exception"
-                    : (mException instanceof DavException) ? "Unexpected WebDAV exception"
-                    : (mException instanceof HttpException) ? "HTTP violation"
-                    : (mException instanceof IOException) ? "Unrecovered transport exception"
-                    : (mException instanceof AccountNotFoundException)
-                        ? handleFailedAccountException((AccountNotFoundException)mException)
-                    : (mException instanceof AccountsException) ? "Exception while using account"
-                    : (mException instanceof JSONException) ? "JSON exception"
-                    : "Unexpected exception";
-        }
-
-        switch (mCode) {
-            case INSTANCE_NOT_CONFIGURED: return "The ownCloud server is not configured!";
-            case NO_NETWORK_CONNECTION: return "No network connection";
-            case BAD_OC_VERSION: return "No valid ownCloud version was found at the server";
-            case LOCAL_STORAGE_FULL: return "Local storage full";
-            case LOCAL_STORAGE_NOT_MOVED: return "Error while moving file to final directory";
-            case ACCOUNT_NOT_NEW: return "Account already existing when creating a new one";
-            case INVALID_CHARACTER_IN_NAME: return "The file name contains an forbidden character";
-            case FILE_NOT_FOUND: return "Local file does not exist";
-            case SYNC_CONFLICT: return "Synchronization conflict";
-            default: return "Operation finished with HTTP status code "
-                    + mHttpCode
-                    + " ("
-                    + (isSuccess() ? "success" : "fail")
-                    + ")";
-        }
-    }
-
-    private String handleFailedAccountException(AccountNotFoundException e) {
-        final Account failedAccount = e.getFailedAccount();
-        return e.getMessage() + " (" +
-                (failedAccount != null ? failedAccount.name : "NULL") + ")";
-    }
-
-    public boolean isServerFail() {
-        return (mHttpCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR);
-    }
-
-    public boolean isException() {
-        return (mException != null);
-    }
-
-    public boolean isTemporalRedirection() {
-        return (mHttpCode == 302 || mHttpCode == 307);
-    }
-
-    public String getRedirectedLocation() {
-        return mRedirectedLocation;
-    }
-
-    public boolean isIdPRedirection() {
-        return (mRedirectedLocation != null &&
-                (mRedirectedLocation.toUpperCase().contains("SAML") ||
-                        mRedirectedLocation.toLowerCase().contains("wayf")));
-    }
-
-    /** TODO: make this set via constructor
-     * Checks if is a non https connection
-     *
-     * @return boolean true/false
-
-    public boolean isNonSecureRedirection() {
-        return (mRedirectedLocation != null && !(mRedirectedLocation.toLowerCase().startsWith("https://")));
-    }
-
-    public ArrayList<String> getAuthenticateHeaders() {
-        return mAuthenticate;
-    }
-
-    public String getLastPermanentLocation() {
-        return mLastPermanentLocation;
-    }
-
-    public void setLastPermanentLocation(String lastPermanentLocation) {
-        mLastPermanentLocation = lastPermanentLocation;
-    }
-    */
-}
diff --git a/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
deleted file mode 100644
index e754e199..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-
-package com.owncloud.android.lib.refactor.operations.files;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-import at.bitfire.dav4android.DavOCResource;
-import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the download of a remote file in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-public class DownloadRemoteFileOperation extends RemoteOperation<Void> {
-
-    private String mRemotePath;
-    private String mLocalFolderPath;
-
-    public DownloadRemoteFileOperation(OCContext ocContext, String remotePath, String localFolderPath) {
-        super(ocContext);
-        mRemotePath = remotePath.replaceAll("^/+", "");
-        mLocalFolderPath = localFolderPath;
-    }
-
-    @Override
-    public Result exec() {
-
-        try {
-            DavOCResource davOCResource = new DavOCResource(
-                    getClient(),
-                    getWebDavHttpUrl(mRemotePath)
-            );
-            davOCResource.get("*/*");
-
-            //TODO Create local file from the downloaded one and implement progress listener
-
-            return new Result(OK);
-
-        } catch (Exception e) {
-            return new Result(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
deleted file mode 100644
index 782e0f18..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.operations.files;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-
-import at.bitfire.dav4android.DavOCResource;
-import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.PropertyUtils;
-import okhttp3.HttpUrl;
-
-import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
-
-public class PropfindOperation extends RemoteOperation<DavResource> {
-
-    private String mRemotePath;
-
-    public PropfindOperation(OCContext ocContext, String remotePath) {
-        super(ocContext);
-        mRemotePath = remotePath;
-    }
-
-    @Override
-    public Result exec() {
-        try {
-            final HttpUrl location = HttpUrl.parse(getWebDavHttpUrl(mRemotePath).toString());
-
-            DavOCResource davOCResource = new DavOCResource(getClient(), location);
-            davOCResource.propfind(1, PropertyUtils.INSTANCE.getAllPropSet());
-
-            return new Result(OK, davOCResource);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new Result(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
deleted file mode 100644
index 3d96ee46..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.refactor.operations.files;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-import at.bitfire.dav4android.DavOCResource;
-
-import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * Remote operation performing the removal of a remote file or folder in the ownCloud server.
- *
- * @author David A. Velasco
- * @author masensio
- * @author David González Verdugo
- */
-public class RemoveRemoteFileOperation extends RemoteOperation<Void> {
-
-    private String mRemotePath;
-
-    public RemoveRemoteFileOperation(OCContext ocContext, String remotePath) {
-        super(ocContext);
-
-        mRemotePath = remotePath;
-    }
-
-    @Override
-    public Result exec() {
-        try {
-            DavOCResource davOCResource = new DavOCResource(
-                    getClient(),
-                    getWebDavHttpUrl(mRemotePath)
-            );
-            davOCResource.delete(null);
-
-            return new Result(OK);
-
-        } catch (Exception e) {
-            return new Result(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
deleted file mode 100644
index 612d1139..00000000
--- a/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- */
-
-package com.owncloud.android.lib.refactor.operations.files;
-
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
-import java.io.File;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import at.bitfire.dav4android.DavOCResource;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-
-import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
-
-/**
- * @author David González Verdugo
- */
-public class UploadRemoteFileOperation extends RemoteOperation<Void> {
-
-    private File mFileToUpload;
-    private String mRemotePath;
-    private String mMimeType;
-    private String mFileLastModifTimestamp;
-    private String mRequiredEtag;
-
-    protected final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
-
-
-    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimeType,
-                                     String fileLastModifTimestamp) {
-        super(ocContext);
-
-        mFileToUpload = new File(localPath);
-        mRemotePath = remotePath.replaceAll("^/+", ""); //Delete leading slashes
-        mMimeType = mimeType;
-        mFileLastModifTimestamp = fileLastModifTimestamp;
-    }
-
-    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimeType,
-                                     String requiredEtag, String fileLastModifTimestamp) {
-        this(ocContext, localPath, remotePath, mimeType, fileLastModifTimestamp);
-        mRequiredEtag = requiredEtag;
-    }
-
-    @Override
-    public Result exec() {
-
-        try {
-
-            MediaType mediaType = MediaType.parse(mMimeType);
-            RequestBody requestBody = RequestBody.create(mediaType, mFileToUpload);
-
-            DavOCResource davOCResource = new DavOCResource(
-                    getClient(),
-                    getWebDavHttpUrl(mRemotePath));
-
-            davOCResource.put(
-                    requestBody,
-                    null,
-                    false,
-                    "multipart/form-data",
-                    String.valueOf(mFileToUpload.length()),
-                    mFileLastModifTimestamp
-            );
-
-            return new Result(OK);
-
-        } catch (Exception e) {
-            return new Result(e);
-        }
-    }
-
-    public void cancel() {
-        synchronized (mCancellationRequested) {
-            mCancellationRequested.set(true);
-            // TODO
-//            if (mPutMethod != null)
-//                mPutMethod.abort();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java b/src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java
deleted file mode 100644
index e886bd62..00000000
--- a/src/com/owncloud/android/lib/refactor/utils/ErrorMessageParser.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2017 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.refactor.utils;
-
-import android.util.Xml;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Parser for server exceptions
- * @author davidgonzalez
- */
-public class ErrorMessageParser {
-	// No namespaces
-	private static final String ns = null;
-
-	// Nodes for XML Parser
-	private static final String NODE_ERROR = "d:error";
-	private static final String NODE_MESSAGE = "s:message";
-
-	/**
-	 * Parse exception response
-	 * @param is
-	 * @return errorMessage for an exception
-	 * @throws XmlPullParserException
-	 * @throws IOException
-	 */
-	public String parseXMLResponse(InputStream is) throws XmlPullParserException,
-			IOException {
-		String errorMessage = "";
-
-		try {
-			// XMLPullParser
-			XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
-			factory.setNamespaceAware(true);
-
-			XmlPullParser parser = Xml.newPullParser();
-			parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
-			parser.setInput(is, null);
-			parser.nextTag();
-			errorMessage = readError(parser);
-
-		} finally {
-			is.close();
-		}
-		return errorMessage;
-	}
-
-	/**
-	 * Parse OCS node
-	 * @param parser
-	 * @return reason for exception
-	 * @throws XmlPullParserException
-	 * @throws IOException
-	 */
-	private String readError (XmlPullParser parser) throws XmlPullParserException, IOException {
-		String errorMessage = "";
-		parser.require(XmlPullParser.START_TAG,  ns , NODE_ERROR);
-		while (parser.next() != XmlPullParser.END_TAG) {
-			if (parser.getEventType() != XmlPullParser.START_TAG) {
-				continue;
-			}
-			String name = parser.getName();
-			// read NODE_MESSAGE
-			if (name.equalsIgnoreCase(NODE_MESSAGE)) {
-				errorMessage = readText(parser);
-			} else {
-				skip(parser);
-			}
-		}
-		return errorMessage;
-	}
-
-	/**
-	 * Skip tags in parser procedure
-	 * @param parser
-	 * @throws XmlPullParserException
-	 * @throws IOException
-	 */
-	private void skip(XmlPullParser parser) throws XmlPullParserException, IOException {
-		if (parser.getEventType() != XmlPullParser.START_TAG) {
-			throw new IllegalStateException();
-		}
-		int depth = 1;
-		while (depth != 0) {
-			switch (parser.next()) {
-				case XmlPullParser.END_TAG:
-					depth--;
-					break;
-				case XmlPullParser.START_TAG:
-					depth++;
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Read the text from a node
-	 * @param parser
-	 * @return Text of the node
-	 * @throws IOException
-	 * @throws XmlPullParserException
-	 */
-	private String readText(XmlPullParser parser) throws IOException, XmlPullParserException {
-		String result = "";
-		if (parser.next() == XmlPullParser.TEXT) {
-			result = parser.getText();
-			parser.nextTag();
-		}
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java b/src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java
deleted file mode 100644
index a5733961..00000000
--- a/src/com/owncloud/android/lib/refactor/utils/InvalidCharacterExceptionParser.java
+++ /dev/null
@@ -1,144 +0,0 @@
-
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-package com.owncloud.android.lib.refactor.utils;
-
-import android.util.Xml;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Parser for Invalid Character server exception
- * @author masensio
- */
-public class InvalidCharacterExceptionParser {
-
-    private static final String EXCEPTION_STRING = "OC\\Connector\\Sabre\\Exception\\InvalidPath";
-	private static final String EXCEPTION_UPLOAD_STRING = "OCP\\Files\\InvalidPathException";
-
-    // No namespaces
-	private static final String ns = null;
-
-    // Nodes for XML Parser
-    private static final String NODE_ERROR = "d:error";
-	private static final String NODE_EXCEPTION = "s:exception";
-    /**
-	 * Parse is as an Invalid Path Exception
-	 * @param is
-	 * @return if The exception is an Invalid Char Exception
-	 * @throws XmlPullParserException
-	 * @throws IOException
-	 */
-	public boolean parseXMLResponse(InputStream is) throws XmlPullParserException,
-            IOException {
-        boolean result = false;
-
-		try {
-			// XMLPullParser
-			XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
-			factory.setNamespaceAware(true);
-
-			XmlPullParser parser = Xml.newPullParser();
-			parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
-			parser.setInput(is, null);
-			parser.nextTag();
-			result = readError(parser);
-
-		} finally {
-			is.close();
-		}
-		return result;
-	}
-
-	/**
-	 * Parse OCS node
-	 * @param parser
-	 * @return List of ShareRemoteFiles
-	 * @throws XmlPullParserException
-	 * @throws IOException
-	 */
-	private boolean readError (XmlPullParser parser) throws XmlPullParserException, IOException {
-		String exception = "";
-		parser.require(XmlPullParser.START_TAG,  ns , NODE_ERROR);
-		while (parser.next() != XmlPullParser.END_TAG) {
-			if (parser.getEventType() != XmlPullParser.START_TAG) {
-				continue;
-			}
-			String name = parser.getName();
-			// read NODE_EXCEPTION
-			if (name.equalsIgnoreCase(NODE_EXCEPTION)) {
-				exception = readText(parser);
-			} else {
-				skip(parser);
-			}
-
-		}
-		return exception.equalsIgnoreCase(EXCEPTION_STRING) ||
-				exception.equalsIgnoreCase(EXCEPTION_UPLOAD_STRING);
-	}
-
-	/**
-	 * Skip tags in parser procedure
-	 * @param parser
-	 * @throws XmlPullParserException
-	 * @throws IOException
-	 */
-	private void skip(XmlPullParser parser) throws XmlPullParserException, IOException {
-		if (parser.getEventType() != XmlPullParser.START_TAG) {
-			throw new IllegalStateException();
-		}
-		int depth = 1;
-		while (depth != 0) {
-			switch (parser.next()) {
-			case XmlPullParser.END_TAG:
-				depth--;
-				break;
-			case XmlPullParser.START_TAG:
-				depth++;
-				break;
-			}
-		}
-	}
-
-    	/**
-	 * Read the text from a node
-	 * @param parser
-	 * @return Text of the node
-	 * @throws IOException
-	 * @throws XmlPullParserException
-	 */
-	private String readText(XmlPullParser parser) throws IOException, XmlPullParserException {
-		String result = "";
-		if (parser.next() == XmlPullParser.TEXT) {
-			result = parser.getText();
-			parser.nextTag();
-		}
-		return result;
-	}
-}
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 5d30178a..bbb5159c 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -29,7 +29,6 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -49,6 +48,8 @@ import at.bitfire.dav4android.property.owncloud.OCPrivatelink;
 import at.bitfire.dav4android.property.owncloud.OCSize;
 import okhttp3.HttpUrl;
 
+import static com.owncloud.android.lib.common.OwnCloudClient.NEW_WEBDAV_PATH_4_0;
+
 /**
  * Contains the data of a Remote File from a WebDavEntry
  *
@@ -231,8 +232,7 @@ public class RemoteFile implements Parcelable, Serializable {
 
 
     private static String getRemotePathFromUrl(HttpUrl url, String displayName) {
-        final String pathToRemove =
-                "/" + RemoteOperation.WEBDAV_PATH_4_0 + "/" + displayName;
+        final String pathToRemove = NEW_WEBDAV_PATH_4_0 + displayName;
         return Uri.decode(url.encodedPath()).replace(pathToRemove, "");
     }
 

From bcc8a78bcfee36f1c35e35ea06b0af3026a5a45f Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 8 Jun 2018 14:43:04 +0200
Subject: [PATCH 048/133] Move OkHttp and dav4android dependencies to the new
 wrapper

---
 .../android/lib/common/OwnCloudClient.java    |  10 +-
 .../lib/common/http/HttpBaseMethod.java       |  38 +++++-
 .../common/http/nonwebdav/DeleteMethod.java   |  12 +-
 .../lib/common/http/nonwebdav/GetMethod.java  |  18 ++-
 .../lib/common/http/nonwebdav/HttpMethod.java |  30 ++++-
 .../lib/common/http/nonwebdav/PostMethod.java |  12 +-
 .../lib/common/http/nonwebdav/PutMethod.java  |  12 +-
 .../common/http/webdav/PropfindMethod.java    |   7 +-
 .../lib/common/network/WebdavUtils.java       |  14 ++-
 .../operations/RemoteOperationResult.java     | 116 ++++++++----------
 .../files/ExistenceCheckRemoteOperation.java  |  29 ++---
 .../files/ReadRemoteFolderOperation.java      |  20 ++-
 .../shares/CreateRemoteShareOperation.java    |  30 ++---
 .../shares/GetRemoteShareOperation.java       |  20 ++-
 .../shares/GetRemoteShareesOperation.java     |  23 ++--
 .../GetRemoteSharesForFileOperation.java      |  20 ++-
 .../shares/GetRemoteSharesOperation.java      |  18 ++-
 .../shares/RemoveRemoteShareOperation.java    |  22 ++--
 .../shares/UpdateRemoteShareOperation.java    |  32 +++--
 .../GetRemoteCapabilitiesOperation.java       |  29 ++---
 .../status/GetRemoteStatusOperation.java      |  22 ++--
 .../users/GetRemoteUserAvatarOperation.java   |  31 ++---
 .../users/GetRemoteUserInfoOperation.java     |  19 +--
 23 files changed, 291 insertions(+), 293 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 6fe0dc9d..3a6ca848 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -310,21 +310,21 @@ public class OwnCloudClient extends HttpClient {
         return status;
     }
 
-    public Response executeHttpMethod (HttpBaseMethod method) throws Exception {
+    public int executeHttpMethod (HttpBaseMethod method) throws Exception {
 
         boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
-        Response response;
+        int status;
 
         do {
-            response = method.execute();
-            repeatWithFreshCredentials = checkUnauthorizedAccess(response.code(), repeatCounter);
+            status = method.execute();
+            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
             if (repeatWithFreshCredentials) {
                 repeatCounter++;
             }
         } while (repeatWithFreshCredentials);
 
-        return response;
+        return status;
     }
 
     private void checkFirstRedirection(HttpMethod method) {
diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index dab22e8c..78d92795 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -24,8 +24,15 @@
 
 package com.owncloud.android.lib.common.http;
 
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import okhttp3.Headers;
 import okhttp3.Request;
 import okhttp3.Response;
+import okhttp3.internal.http2.Header;
 
 /**
  * Wrapper to perform http calls transparently by using:
@@ -35,10 +42,33 @@ import okhttp3.Response;
  * @author David González Verdugo
  */
 public abstract class HttpBaseMethod {
-    public abstract Response execute() throws Exception;
-    protected Request mRequest;
+    public abstract int execute() throws Exception;
+    protected Response mResponse;
+    private static final String TAG = HttpBaseMethod.class.getSimpleName();
 
-    public Request getRequest() {
-        return mRequest;
+    // Status
+    public int getStatusCode() {
+        return mResponse.code();
+    }
+
+    public String getStatusMessage() {
+        return mResponse.message();
+    }
+
+    // Response
+    public String getResponseBodyAsString() throws IOException {
+        return mResponse.body().string();
+    }
+
+    public InputStream getResponseAsStream() {
+        return mResponse.body().byteStream();
+    }
+
+    public Headers getResponseHeaders() {
+        return mResponse.headers();
+    }
+
+    public String getResponseHeader(String headerName) {
+        return mResponse.header(headerName);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
index 61e9aa1d..cdbf4ef6 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
@@ -34,17 +34,19 @@ import okhttp3.Response;
  */
 public class DeleteMethod extends HttpMethod{
 
-    public DeleteMethod(OkHttpClient okHttpClient, Request baseRequest) {
-        super(okHttpClient, baseRequest);
+    public DeleteMethod(OkHttpClient okHttpClient, String httpUrl) {
+        super(okHttpClient, httpUrl);
     }
 
     @Override
-    public Response execute() throws Exception {
-        mRequest = mBaseRequest
+    public int execute() throws Exception {
+        Request request = mRequest
                 .newBuilder()
                 .delete()
                 .build();
 
-        return mOkHttpClient.newCall(mRequest).execute();
+        mResponse = mOkHttpClient.newCall(request).execute();
+
+        return mResponse.code();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
index f2ac6523..f0246139 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
@@ -26,9 +26,9 @@ package com.owncloud.android.lib.common.http.nonwebdav;
 
 import java.io.IOException;
 
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * OkHttp get calls wrapper
@@ -36,17 +36,23 @@ import okhttp3.Response;
  */
 public class GetMethod extends HttpMethod {
 
-    public GetMethod(OkHttpClient okHttpClient, Request baseRequest) {
-        super(okHttpClient, baseRequest);
+    public GetMethod(OkHttpClient okHttpClient, String httpUrl) {
+        super(okHttpClient, httpUrl);
+    }
+
+    public GetMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
+        super(okHttpClient, httpUrl);
     }
 
     @Override
-    public Response execute() throws IOException {
-        mRequest = mBaseRequest
+    public int execute() throws IOException {
+        Request request = mRequest
                 .newBuilder()
                 .get()
                 .build();
 
-        return mOkHttpClient.newCall(mRequest).execute();
+        mResponse = mOkHttpClient.newCall(request).execute();
+
+        return mResponse.code();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
index ec54b9b2..73912194 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
@@ -26,20 +26,42 @@ package com.owncloud.android.lib.common.http.nonwebdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
 /**
  * Wrapper to perform OkHttp calls
+ *
  * @author David González Verdugo
  */
 public abstract class HttpMethod extends HttpBaseMethod {
-
     protected OkHttpClient mOkHttpClient;
-    protected Request mBaseRequest;
+    protected Request mRequest;
 
-    public HttpMethod (OkHttpClient okHttpClient, Request baseRequest) {
+    public HttpMethod(OkHttpClient okHttpClient, String httpUrl) {
         mOkHttpClient = okHttpClient;
-        mBaseRequest = baseRequest;
+        mRequest = new Request.Builder()
+                .url(httpUrl)
+                .build();
+    }
+
+    public HttpMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
+        mOkHttpClient = okHttpClient;
+        mRequest = new Request.Builder()
+                .url(httpUrl)
+                .build();
+    }
+
+    // Request headers
+    public void addRequestHeader(String name, String value) {
+        mRequest.newBuilder()
+                .addHeader(name, value)
+                .build();
+    }
+
+    public void setRequestHeader(String name, String value){
+        mRequest.newBuilder()
+                .header(name, value);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
index 0bf4b794..8defb0e6 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
@@ -37,18 +37,20 @@ public class PostMethod extends HttpMethod {
 
     private RequestBody mRequestBody;
 
-    public PostMethod(OkHttpClient okHttpClient, Request baseRequest, RequestBody requestBody){
-        super(okHttpClient, baseRequest);
+    public PostMethod(OkHttpClient okHttpClient, String httpUrl, RequestBody requestBody){
+        super(okHttpClient, httpUrl);
         mRequestBody = requestBody;
     }
 
     @Override
-    public Response execute() throws Exception {
-        mRequest = mBaseRequest
+    public int execute() throws Exception {
+        Request request = mRequest
                 .newBuilder()
                 .post(mRequestBody)
                 .build();
 
-        return mOkHttpClient.newCall(mRequest).execute();
+        mResponse = mOkHttpClient.newCall(request).execute();
+
+        return mResponse.code();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
index 39dcfc8e..854cb95d 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
@@ -33,18 +33,20 @@ public class PutMethod extends HttpMethod{
 
     private RequestBody mRequestBody;
 
-    public PutMethod(OkHttpClient okHttpClient, Request baseRequest, RequestBody requestBody){
-        super(okHttpClient, baseRequest);
+    public PutMethod(OkHttpClient okHttpClient, String httpUrl, RequestBody requestBody){
+        super(okHttpClient, httpUrl);
         mRequestBody = requestBody;
     }
 
     @Override
-    public Response execute() throws Exception {
-        mRequest = mBaseRequest
+    public int execute() throws Exception {
+        Request request = mRequest
                 .newBuilder()
                 .put(mRequestBody)
                 .build();
 
-        return mOkHttpClient.newCall(mRequest).execute();
+        mResponse = mOkHttpClient.newCall(request).execute();
+
+        return mResponse.code();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
index 6891c9f6..d8737714 100644
--- a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
@@ -51,7 +51,7 @@ public class PropfindMethod extends DavMethod {
     };
 
     @Override
-    public Response execute() throws IOException, HttpException, DavException {
+    public int execute() throws IOException, HttpException, DavException {
         try {
             mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
             mMembers = mDavResource.getMembers();
@@ -59,8 +59,9 @@ public class PropfindMethod extends DavMethod {
             // Do nothing, we will use the 401 code to handle the situation
         }
 
-        mRequest = mDavResource.getRequest();
-        return mDavResource.getResponse();
+        mResponse = mDavResource.getResponse();
+
+        return mResponse.code();
     }
 
     public int getDepth() {
diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
index 62f4045f..883a50fb 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -32,6 +32,8 @@ import java.util.Locale;
 
 import android.net.Uri;
 
+import com.owncloud.android.lib.common.http.HttpBaseMethod;
+
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
@@ -173,19 +175,19 @@ public class WebdavUtils {
 
     /**
      *
-     * @param response from which to get the etag
+     * @param httpBaseMethod from which to get the etag
      * @return etag from response
      */
-    public static String getEtagFromResponse(Response response) {
-        String eTag = response.header("OC-ETag");
+    public static String getEtagFromResponse(HttpBaseMethod httpBaseMethod) {
+        String eTag = httpBaseMethod.getResponseHeader("OC-ETag");
         if (eTag == null) {
-            eTag = response.header("oc-etag");
+            eTag = httpBaseMethod.getResponseHeader("oc-etag");
         }
         if (eTag == null) {
-            eTag = response.header("ETag");
+            eTag = httpBaseMethod.getResponseHeader("ETag");
         }
         if (eTag == null) {
-            eTag = response.header("etag");
+            eTag = httpBaseMethod.getResponseHeader("etag");
         }
         String result = "";
         if (eTag != null) {
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 14850acf..3826e350 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -28,6 +28,7 @@ import android.accounts.Account;
 import android.accounts.AccountsException;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -54,8 +55,6 @@ import java.util.Map;
 import javax.net.ssl.SSLException;
 
 import okhttp3.Headers;
-import okhttp3.Request;
-import okhttp3.Response;
 
 
 /**
@@ -226,6 +225,7 @@ public class RemoteOperationResult implements Serializable {
      * @param httpMethod HTTP/DAV method already executed which response will be examined to interpret the
      *                   result.
      */
+    // TODO Delete this
     public RemoteOperationResult(boolean success, HttpMethod httpMethod) throws IOException {
 //        this(
 //                success,
@@ -279,20 +279,19 @@ public class RemoteOperationResult implements Serializable {
      * will depend on the HTTP code and HTTP response headers received. In some cases will inspect also the
      * response body
      *
-     * @param success
-     * @param request
-     * @param response
+     * @param httpMethod
      * @throws IOException
      */
-    public RemoteOperationResult(boolean success, Request request, Response response) throws IOException {
-        this(success, response.code(), HttpStatus.getStatusText(response.code()), response.headers());
+    public RemoteOperationResult(HttpBaseMethod httpMethod) throws IOException {
+        this(httpMethod.getStatusCode(),
+                httpMethod.getStatusMessage(),
+                httpMethod.getResponseHeaders()
+        );
 
-        // TODO success parameter might not be needed
         if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
+            String bodyResponse = httpMethod.getResponseBodyAsString();
 
-            String bodyResponse = response.body().string();
             // do not get for other HTTP codes!; could not be available
-
             if (bodyResponse != null && bodyResponse.length() > 0) {
                 InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
                 InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
@@ -311,16 +310,22 @@ public class RemoteOperationResult implements Serializable {
         // before
         switch (mHttpCode) {
             case HttpStatus.SC_FORBIDDEN:
-                // TODO
-//                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_FORBIDDEN);
+                parseErrorMessageAndSetCode(
+                        httpMethod.getResponseBodyAsString(),
+                        ResultCode.SPECIFIC_FORBIDDEN
+                );
                 break;
             case HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE:
-                // TODO
-//                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE);
+                parseErrorMessageAndSetCode(
+                        httpMethod.getResponseBodyAsString(),
+                        ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE
+                );
                 break;
             case HttpStatus.SC_SERVICE_UNAVAILABLE:
-                // TODO
-//                parseErrorMessageAndSetCode(request, response, ResultCode.SPECIFIC_SERVICE_UNAVAILABLE);
+                parseErrorMessageAndSetCode(
+                        httpMethod.getResponseBodyAsString(),
+                        ResultCode.SPECIFIC_SERVICE_UNAVAILABLE
+                );
                 break;
             default:
                 break;
@@ -356,6 +361,33 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
+
+    /**
+     * Parse the error message included in the body response, if any, and set the specific result
+     * code
+     *
+     * @param bodyResponse okHttp response body
+     * @param resultCode our own custom result code
+     * @throws IOException
+     */
+    private void parseErrorMessageAndSetCode(String bodyResponse, ResultCode resultCode) {
+
+        if (bodyResponse != null && bodyResponse.length() > 0) {
+            InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
+            ErrorMessageParser xmlParser = new ErrorMessageParser();
+            try {
+                String errorMessage = xmlParser.parseXMLResponse(is);
+                if (errorMessage != "" && errorMessage != null) {
+                    mCode = resultCode;
+                    mHttpPhrase = errorMessage;
+                }
+            } catch (Exception e) {
+                Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
+                // mCode stays as set in this(success, httpCode, headers)
+            }
+        }
+    }
+
     /**
      * Public constructor from separate elements of an HTTP or DAV response.
      *
@@ -367,13 +399,12 @@ public class RemoteOperationResult implements Serializable {
      *
      * Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
      *
-     * @param success     The operation was considered successful or not.
      * @param httpCode    HTTP status code returned by an HTTP/DAV method.
      * @param httpPhrase  HTTP status line phrase returned by an HTTP/DAV method
      * @param headers HTTP response header returned by an HTTP/DAV method
      */
-    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Headers headers) {
-        this(success, httpCode, httpPhrase);
+    public RemoteOperationResult(int httpCode, String httpPhrase, Headers headers) {
+        this(httpCode, httpPhrase);
         if (headers != null) {
             for (Map.Entry<String, List<String>> header : headers.toMultimap().entrySet()) {
                 if ("location".equals(header.getKey().toLowerCase())) {
@@ -390,60 +421,20 @@ public class RemoteOperationResult implements Serializable {
             mCode = com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.UNAUTHORIZED;
         }
     }
-//
-//    /**
-//     * Public constructor from separate elements of an HTTP or DAV response.
-//     *
-//     * To be used when the result needs to be interpreted from HTTP response elements that could come from
-//     * different requests (WARNING: black magic, try to avoid).
-//     *
-//     * If all the fields come from the same HTTP/DAV response, {@link #RemoteOperationResult(boolean, HttpMethod)}
-//     * should be used instead.
-//     *
-//     * Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
-//     *
-//     * @param success     The operation was considered successful or not.
-//     * @param httpCode    HTTP status code returned by an HTTP/DAV method.
-//     * @param httpPhrase  HTTP status line phrase returned by an HTTP/DAV method
-//     * @param httpHeaders HTTP response header returned by an HTTP/DAV method
-//     */
-//    public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, Header[] httpHeaders) {
-//        this(success, httpCode, httpPhrase);
-//        if (httpHeaders != null) {
-//            for (Header httpHeader : httpHeaders) {
-//                if ("location".equals(httpHeader.getName().toLowerCase())) {
-//                    mRedirectedLocation = httpHeader.getValue();
-//                    continue;
-//                }
-//                if ("www-authenticate".equals(httpHeader.getName().toLowerCase())) {
-//                    mAuthenticate.add(httpHeader.getValue().toLowerCase());
-//                }
-//            }
-//        }
-//        if (isIdPRedirection()) {
-//            // overrides default ResultCode.UNKNOWN
-//            mCode = ResultCode.UNAUTHORIZED;    // overrides default ResultCode.UNKNOWN
-//        }
-//    }
 
     /**
      * Private constructor for results built interpreting a HTTP or DAV response.
      *
      * Determines a {@link ResultCode} depending of the type of the exception.
      *
-     * @param success    Operation was successful or not.
      * @param httpCode   HTTP status code returned by the HTTP/DAV method.
      * @param httpPhrase HTTP status line phrase returned by the HTTP/DAV method
      */
-    private RemoteOperationResult(boolean success, int httpCode, String httpPhrase) {
-        mSuccess = success;
+    private RemoteOperationResult(int httpCode, String httpPhrase) {
         mHttpCode = httpCode;
         mHttpPhrase = httpPhrase;
 
-        if (success) {
-            mCode = ResultCode.OK;
-
-        } else if (httpCode > 0) {
+        if (httpCode > 0) {
             switch (httpCode) {
                 case HttpStatus.SC_UNAUTHORIZED:                    // 401
                     mCode = ResultCode.UNAUTHORIZED;
@@ -668,5 +659,4 @@ public class RemoteOperationResult implements Serializable {
     public void setLastPermanentLocation(String lastPermanentLocation) {
         mLastPermanentLocation = lastPermanentLocation;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 7516febb..13831be6 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -32,10 +33,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-
 import okhttp3.HttpUrl;
-import okhttp3.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -43,6 +41,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * Operation to check the existence or absence of a path in a remote server.
  * 
  * @author David A. Velasco
+ * @author David GonzálezVerdugo
  */
 public class ExistenceCheckRemoteOperation extends RemoteOperation {
     
@@ -81,13 +80,12 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
         try {
 
 //            client.setFollowRedirects(false);
-
             PropfindMethod propfindMethod = new PropfindMethod(
                     client.getOkHttpClient(),
                     HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0);
 
-            Response response = client.executeHttpMethod(propfindMethod);
+            int status = client.executeHttpMethod(propfindMethod);
 
 //            if (previousFollowRedirects) {
 //                mRedirectionPath = client.followRedirection(propfind);
@@ -102,22 +100,15 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
              *  404 NOT FOUND: path doesn't exist,
              *  207 MULTI_STATUS: path exists.
              */
-            boolean isSuccess = ((response.code() == HttpStatus.SC_OK
-                    || response.code() == HttpStatus.SC_MULTI_STATUS)
-                    && !mSuccessIfAbsent)
-                    || (response.code() == HttpStatus.SC_MULTI_STATUS && !mSuccessIfAbsent)
-                    || (response.code() == HttpStatus.SC_NOT_FOUND && mSuccessIfAbsent);
 
-            result = isSuccess
-                    ? new RemoteOperationResult(OK)
-                    : new RemoteOperationResult(
-                            false, propfindMethod.getRequest(), response
-            );
+            result = isSuccess(status) ?
+                    new RemoteOperationResult(OK) :
+                    new RemoteOperationResult(propfindMethod);
 
             Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
-                    "finished with HTTP status " + response.code() + (!isSuccess?"(FAIL)":""));
+                    "finished with HTTP status " + status + (!isSuccess(status)?"(FAIL)":""));
             
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
@@ -147,4 +138,10 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
     public boolean wasRedirected() {
         return (mRedirectionPath != null && mRedirectionPath.getRedirectionsCount() > 0);
     }
+
+    private boolean isSuccess(int status) {
+        return ((status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_MULTI_STATUS) && !mSuccessIfAbsent)
+                || (status == HttpConstants.HTTP_MULTI_STATUS && !mSuccessIfAbsent)
+                || (status == HttpConstants.HTTP_NOT_FOUND && mSuccessIfAbsent);
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index f5fa941e..8c699fb3 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -36,7 +36,6 @@ import java.util.ArrayList;
 
 import at.bitfire.dav4android.DavResource;
 import okhttp3.HttpUrl;
-import okhttp3.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -79,12 +78,9 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
                     HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     1);
 
-            Response response = client.executeHttpMethod(propfindMethod);
+            int status = client.executeHttpMethod(propfindMethod);
 
-            boolean isSuccess = (response.code() == HttpConstants.HTTP_MULTI_STATUS
-                    || response.code() == HttpConstants.HTTP_OK);
-
-            if (isSuccess) {
+            if (isSuccess(status)) {
 
                 ArrayList<Object> mFolderAndFiles = new ArrayList<>();
 
@@ -104,13 +100,8 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
                 result.setData(mFolderAndFiles);
 
             } else {
-
                 // synchronization failed
-                result = new RemoteOperationResult(
-                        false,
-                        propfindMethod.getRequest(),
-                        response
-                );
+                result = new RemoteOperationResult(propfindMethod);
             }
 
         } catch (Exception e) {
@@ -129,4 +120,9 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
         }
         return result;
     }
+
+    private boolean isSuccess(int status) {
+        return status == HttpConstants.HTTP_MULTI_STATUS ||
+                status == HttpConstants.HTTP_OK;
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 7361fa84..12f5ed0e 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -42,8 +42,6 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import okhttp3.FormBody;
-import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * Creates a new share.  This allows sharing with a user or group or as a link.
@@ -200,17 +198,6 @@ public class CreateRemoteShareOperation extends RemoteOperation {
         RemoteOperationResult result;
 
         try {
-            Uri requestUri = client.getBaseUri();
-            Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
-
-            Request request = new Request.Builder()
-                    .url(uriBuilder.build().toString())
-                    .header("Content-Type", 
-                            "application/x-www-form-urlencoded; charset=utf-8")
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
-
             FormBody.Builder formBodyBuilder = new FormBody.Builder()
                     .add(PARAM_PATH, mRemoteFilePath)
                     .add(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue()))
@@ -240,11 +227,18 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
             FormBody formBody = formBodyBuilder.build();
 
-            PostMethod postMethod = new PostMethod(client.getOkHttpClient(), request, formBody);
+            Uri requestUri = client.getBaseUri();
+            Uri.Builder uriBuilder = requestUri.buildUpon();
+            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            Response response = client.executeHttpMethod(postMethod);
+            PostMethod postMethod = new PostMethod(client.getOkHttpClient(),
+                    uriBuilder.build().toString(), formBody);
+            postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            if (isSuccess(response.code())) {
+            int status = client.executeHttpMethod(postMethod);
+
+            if (isSuccess(status)) {
 
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                         new ShareXMLParser()
@@ -252,7 +246,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 parser.setOneOrMoreSharesRequired(true);
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response.body().string());
+                result = parser.parse(postMethod.getResponseBodyAsString());
 
                 if (result.isSuccess() && mGetShareDetails) {
 
@@ -266,7 +260,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 }
 
             } else {
-                result = new RemoteOperationResult(false, postMethod.getRequest(), response);
+                result = new RemoteOperationResult(postMethod);
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index e1e5443c..17e706be 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -35,9 +35,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import okhttp3.Request;
-import okhttp3.Response;
-
 /**
  * Get the data about a Share resource, known its remote ID.
  *
@@ -66,15 +63,12 @@ public class GetRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            final Request request = new Request.Builder()
-                    .url(uriBuilder.build().toString())
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(),
+                    uriBuilder.build().toString());
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            int status = client.executeHttpMethod(getMethod);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
-            Response response = client.executeHttpMethod(getMethod);
-
-            if (isSuccess(response.code())) {
+            if (isSuccess(status)) {
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                         new ShareXMLParser()
@@ -82,10 +76,10 @@ public class GetRemoteShareOperation extends RemoteOperation {
                 parser.setOneOrMoreSharesRequired(true);
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response.body().string());
+                result = parser.parse(getMethod.getResponseBodyAsString());
 
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                result = new RemoteOperationResult(getMethod);
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 3562c3f4..8f045f14 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -42,9 +42,6 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import okhttp3.Request;
-import okhttp3.Response;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -133,19 +130,17 @@ public class GetRemoteShareesOperation extends RemoteOperation{
             uriBuilder.appendQueryParameter(PARAM_PAGE, String.valueOf(mPage));
             uriBuilder.appendQueryParameter(PARAM_PER_PAGE, String.valueOf(mPerPage));
 
-            Request request = new Request.Builder()
-                    .url(uriBuilder.build().toString())
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), uriBuilder.build().toString());
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
-            Response response = client.executeHttpMethod(getMethod);
+            int status = client.executeHttpMethod(getMethod);
+            String response = getMethod.getResponseBodyAsString();
 
-            if(isSuccess(response.code())) {
+            if(isSuccess(status)) {
                 Log_OC.d(TAG, "Successful response: " + response);
 
                 // Parse the response
-                JSONObject respJSON = new JSONObject(response.body().string());
+                JSONObject respJSON = new JSONObject(response);
                 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
                 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
                 JSONObject respExact = respData.getJSONObject(NODE_EXACT);
@@ -179,12 +174,12 @@ public class GetRemoteShareesOperation extends RemoteOperation{
                 Log_OC.d(TAG, "*** Get Users or groups completed " );
 
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                result = new RemoteOperationResult(getMethod);
                 Log_OC.e(TAG, "Failed response while getting users/groups from the server ");
                 if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + response.code() + "; response message: " + response);
+                    Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
                 } else {
-                    Log_OC.e(TAG, "*** status code: " + response.code());
+                    Log_OC.e(TAG, "*** status code: " + status);
                 }
             }
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index c5141e0f..244c3a56 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -29,16 +29,14 @@ package com.owncloud.android.lib.resources.shares;
 
 import android.net.Uri;
 
+import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
-import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import okhttp3.HttpUrl;
-import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * Provide a list shares for a specific file.
@@ -95,29 +93,25 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
             httpBuilder.addQueryParameter(PARAM_RESHARES, String.valueOf(mReshares));
             httpBuilder.addQueryParameter(PARAM_SUBFILES, String.valueOf(mSubfiles));
 
-            Request request = new Request.Builder()
-                    .url(httpBuilder.build())
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), httpBuilder.build());
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            int status = client.executeHttpMethod(getMethod);
 
-            Response response = client.executeHttpMethod(getMethod);
-
-            if (isSuccess(response.code())) {
+            if (isSuccess(status)) {
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                     new ShareXMLParser()
                 );
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response.body().string());
+                result = parser.parse(getMethod.getResponseBodyAsString());
 
                 if (result.isSuccess()) {
                     Log_OC.d(TAG, "Got " + result.getData().size() + " shares");
                 }
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                result = new RemoteOperationResult(getMethod);
             }
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 95519f06..84e92cfa 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -35,7 +35,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * Get the data from the server about ALL the known shares owned by the requester.
@@ -58,16 +57,13 @@ public class GetRemoteSharesOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            Request request = new Request.Builder()
-                    .url(uriBuilder.build().toString())
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(),
+                    uriBuilder.build().toString());
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            int status = client.executeHttpMethod(getMethod);
 
-            Response response = client.executeHttpMethod(getMethod);
-
-            if (isSuccess(response.code())) {
+            if (isSuccess(status)) {
 
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
@@ -75,9 +71,9 @@ public class GetRemoteSharesOperation extends RemoteOperation {
                 );
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response.body().string());
+                result = parser.parse(getMethod.getResponseBodyAsString());
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                result = new RemoteOperationResult(getMethod);
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index 8e2fb4d1..403d2002 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -37,7 +37,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * Remove a share
@@ -68,34 +67,29 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
         RemoteOperationResult result;
 
         try {
-            String id = "/" + String.valueOf(mRemoteShareId);
-
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
-            uriBuilder.appendEncodedPath(String.valueOf(id));
+            uriBuilder.appendEncodedPath(String.valueOf(mRemoteShareId));
 
-            Request request = new Request.Builder()
-                    .url(uriBuilder.build().toString())
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
+            DeleteMethod deleteMethod = new DeleteMethod(client.getOkHttpClient(),
+                    uriBuilder.build().toString());
+            deleteMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            DeleteMethod deleteMethod = new DeleteMethod(client.getOkHttpClient(), request);
+            int status = client.executeHttpMethod(deleteMethod);
 
-            Response response = client.executeHttpMethod(deleteMethod);
-
-            if (isSuccess(response.code())) {
+            if (isSuccess(status)) {
 
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                         new ShareXMLParser()
                 );
-                result = parser.parse(response.body().string());
+                result = parser.parse(deleteMethod.getResponseBodyAsString());
 
                 Log_OC.d(TAG, "Unshare " + mRemoteShareId + ": " + result.getLogMessage());
 
             } else {
-                result = new RemoteOperationResult(false, deleteMethod.getRequest(), response);
+                result = new RemoteOperationResult(deleteMethod);
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 9fc15881..563e629d 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -41,7 +41,6 @@ import java.util.Locale;
 
 import okhttp3.FormBody;
 import okhttp3.Request;
-import okhttp3.Response;
 
 
 /**
@@ -169,18 +168,6 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
         RemoteOperationResult result;
 
         try {
-            Uri requestUri = client.getBaseUri();
-            Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
-            uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
-
-            Request request = new Request.Builder()
-                    .url(uriBuilder.build().toString())
-                    .header("Content-Type",
-                            "application/x-www-form-urlencoded; charset=utf-8")
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
-
             FormBody.Builder formBodyBuilder = new FormBody.Builder();
 
             // Parameters to update
@@ -212,23 +199,32 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
                 formBodyBuilder.add(PARAM_PERMISSIONS, Integer.toString(mPermissions));
             }
 
+            Uri requestUri = client.getBaseUri();
+            Uri.Builder uriBuilder = requestUri.buildUpon();
+            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
+            uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
+
             FormBody formBody = formBodyBuilder.build();
 
-            PutMethod putMethod = new PutMethod(client.getOkHttpClient(), request, formBody);
+            PutMethod putMethod = new PutMethod(client.getOkHttpClient(),
+                    uriBuilder.build().toString(), formBody);
+            putMethod.setRequestHeader("Content-Type",
+                    "application/x-www-form-urlencoded; charset=utf-8");
+            putMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            Response response = client.executeHttpMethod(putMethod);
+            int status = client.executeHttpMethod(putMethod);
 
-            if (isSuccess(response.code())) {
+            if (isSuccess(status)) {
                 // Parse xml response
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
                         new ShareXMLParser()
                 );
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());
                 parser.setServerBaseUri(client.getBaseUri());
-                result = parser.parse(response.body().string());
+                result = parser.parse(putMethod.getResponseBodyAsString());
 
             } else {
-                result = new RemoteOperationResult(false, putMethod.getRequest(), response);
+                result = new RemoteOperationResult(putMethod);
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 9ee81f97..3b6f7c0d 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -40,9 +40,6 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import okhttp3.Request;
-import okhttp3.Response;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -133,20 +130,17 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
 
             String url = uriBuilder.build().toString();
 
-            final Request request = new Request.Builder()
-                    .url(url)
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), url);
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            int status = client.executeHttpMethod(getMethod);
 
-            final Response response = client.executeHttpMethod(getMethod);
-
-            if(isSuccess(response.code())) {
+            String response = getMethod.getResponseBodyAsString();
+            if(isSuccess(status)) {
                 Log_OC.d(TAG, "Successful response: " + response);
 
                 // Parse the response
-                JSONObject respJSON = new JSONObject(response.body().string());
+                JSONObject respJSON = new JSONObject(response);
                 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
                 JSONObject respMeta = respOCS.getJSONObject(NODE_META);
                 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
@@ -269,19 +263,18 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
 
                     Log_OC.d(TAG, "*** Get Capabilities completed ");
                 } else {
-                    result = new RemoteOperationResult(statusProp, statuscode, null, null);
+                    result = new RemoteOperationResult(statuscode, message, null);
                     Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
                     Log_OC.e(TAG, "*** status: " + statusProp + "; message: " + message);
                 }
 
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                result = new RemoteOperationResult(getMethod);
                 Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
-                if (response.body().string() != null) {
-                    Log_OC.e(TAG, "*** status code: " + response.code() + "; response message: " +
-                            response.body().string());
+                if (response != null) {
+                    Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
                 } else {
-                    Log_OC.e(TAG, "*** status code: " + response.code());
+                    Log_OC.e(TAG, "*** status code: " + status);
                 }
             }
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 1d2a4558..e826ce71 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -40,9 +40,6 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import okhttp3.Request;
-import okhttp3.Response;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -79,17 +76,12 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         boolean retval = false;
         String baseUrlSt = client.getBaseUri().toString();
         try {
-
             String url = baseUrlSt + OwnCloudClient.STATUS_PATH;
 
-            final Request request = new Request.Builder()
-                    .url(url)
-                    .build();
-
             client.setFollowRedirects(false);
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), url);
 
-            Response response = client.executeHttpMethod(getMethod);
+            int status = client.executeHttpMethod(getMethod);
 
             mLatestResult = new RemoteOperationResult(OK);
 
@@ -115,9 +107,9 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 //                redirectedLocation = mLatestResult.getRedirectedLocation();
 //            }
 
-            if (response.code() == HttpConstants.HTTP_OK) {
+            if (isSuccess(status)) {
 
-                JSONObject respJSON = new JSONObject(response.body().string());
+                JSONObject respJSON = new JSONObject(getMethod.getResponseBodyAsString());
                 if (!respJSON.getBoolean(NODE_INSTALLED)) {
                     mLatestResult = new RemoteOperationResult(
                         RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
@@ -147,7 +139,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                 }
 
             } else {
-                mLatestResult = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                mLatestResult = new RemoteOperationResult(getMethod);
             }
 
         } catch (JSONException e) {
@@ -199,4 +191,8 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         }
         return mLatestResult;
     }
+
+    private boolean isSuccess(int status) {
+        return (status == HttpConstants.HTTP_OK);
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index e25beaef..8619a73c 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -40,9 +40,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 
-import okhttp3.Request;
-import okhttp3.Response;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 
@@ -76,11 +73,11 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
+        GetMethod getMethod = null;
         RemoteOperationResult result;
         InputStream inputStream = null;
         BufferedInputStream bis = null;
         ByteArrayOutputStream bos = null;
-        Response response = null;
 
         try {
             String url =
@@ -89,17 +86,13 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
             ;
             Log_OC.d(TAG, "avatar URI: " + url);
 
-            final Request request = new Request.Builder()
-                    .url(url)
-                    .build();
+            getMethod = new GetMethod(client.getOkHttpClient(), url);
+            int status = client.executeHttpMethod(getMethod);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
-            response = client.executeHttpMethod(getMethod);
-
-            if (isSuccess(response.code())) {
+            if (isSuccess(status)) {
                 // find out size of file to read
                 int totalToTransfer = 0;
-                String contentLength = response.header("Content-Length");
+                String contentLength = getMethod.getResponseHeader("Content-Length");
 
                 if (contentLength != null && contentLength.length() > 0) {
                     totalToTransfer = Integer.parseInt(contentLength);
@@ -107,7 +100,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
 
                 // find out MIME-type!
                 String mimeType;
-                String contentType =response.header("Content-Type");
+                String contentType = getMethod.getResponseHeader("Content-Type");
 
                 if (contentType == null || !contentType.startsWith("image")) {
                     Log_OC.e(
@@ -122,7 +115,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 mimeType = contentType;
 
                 /// download will be performed to a buffer
-                inputStream = response.body().byteStream();
+                inputStream = getMethod.getResponseAsStream();
                 bis = new BufferedInputStream(inputStream);
                 bos = new ByteArrayOutputStream(totalToTransfer);
 
@@ -136,7 +129,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 // TODO check total bytes transferred?
 
                 // find out etag
-                String etag = WebdavUtils.getEtagFromResponse(response);
+                String etag = WebdavUtils.getEtagFromResponse(getMethod);
                 if (etag.length() == 0) {
                     Log_OC.w(TAG, "Could not read Etag from avatar");
                 }
@@ -149,8 +142,8 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 result.setData(data);
 
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
-                client.exhaustResponse(response.body().byteStream());
+                result = new RemoteOperationResult(getMethod);
+                client.exhaustResponse(getMethod.getResponseAsStream());
             }
 
         } catch (Exception e) {
@@ -158,7 +151,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
             Log_OC.e(TAG, "Exception while getting OC user avatar", e);
 
         } finally {
-            if (response != null) {
+            if (getMethod != null) {
                 try {
                     if (inputStream != null) {
                         client.exhaustResponse(inputStream);
@@ -178,7 +171,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 } catch (IOException o) {
                     Log_OC.e(TAG, "Unexpected exception closing output stream ", o);
                 }
-                response.body().close();
+                client.exhaustResponse(getMethod.getResponseAsStream());
             }
         }
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index 25a8da92..e5bc60f6 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -75,13 +75,15 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), request);
-            Response response = client.executeHttpMethod(getMethod);
+            String url = client.getBaseUri() + OCS_ROUTE;
 
-            if (isSuccess(response.code())) {
+            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), url);
+            int status = client.executeHttpMethod(getMethod);
+
+            if (isSuccess(status)) {
                 Log_OC.d(TAG, "Successful response");
 
-                JSONObject respJSON = new JSONObject(response.body().string());
+                JSONObject respJSON = new JSONObject(getMethod.getResponseBodyAsString());
                 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
                 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
 
@@ -97,12 +99,13 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                 result.setData(data);
 
             } else {
-                result = new RemoteOperationResult(false, getMethod.getRequest(), response);
+                result = new RemoteOperationResult(getMethod);
+                String response = getMethod.getResponseBodyAsString();
                 Log_OC.e(TAG, "Failed response while getting user information ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + response.code() + " ; response message: " + response);
+                if (getMethod != null) {
+                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
                 } else {
-                    Log_OC.e(TAG, "*** status code: " + response.code());
+                    Log_OC.e(TAG, "*** status code: " + status);
                 }
             }
         } catch (Exception e) {

From 7fe2c02fc172a49370a32a69b5c8d770b68d5739 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 8 Jun 2018 15:14:05 +0200
Subject: [PATCH 049/133] Include methot to make a result successful

---
 .../android/lib/common/operations/RemoteOperationResult.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 3826e350..82023ccd 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -461,6 +461,7 @@ public class RemoteOperationResult implements Serializable {
                     mCode = ResultCode.UNHANDLED_HTTP_CODE;         // UNKNOWN ERROR
                     Log_OC.d(TAG,
                             "RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " +
+
                                     mHttpCode + " " + mHttpPhrase
                     );
             }
@@ -659,4 +660,8 @@ public class RemoteOperationResult implements Serializable {
     public void setLastPermanentLocation(String lastPermanentLocation) {
         mLastPermanentLocation = lastPermanentLocation;
     }
+
+    public void setSuccess(boolean success) {
+        this.mSuccess = success;
+    }
 }
\ No newline at end of file

From f5795d1c03c598682a3cd42b904f2edecb3a42a8 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 11 Jun 2018 10:48:07 +0200
Subject: [PATCH 050/133] Keep refactoring wrapper

---
 .../owncloud/android/lib/common/OwnCloudClient.java   |  7 +++----
 .../authentication/OwnCloudBasicCredentials.java      |  4 ++--
 .../android/lib/common/http/HttpBaseMethod.java       | 11 ++++++++---
 .../{ => http}/interceptors/BasicAuthInterceptor.java |  2 +-
 .../{ => http}/interceptors/HttpInterceptor.java      |  2 +-
 .../{ => http}/interceptors/UserAgentInterceptor.java |  2 +-
 .../http/{ => methods}/nonwebdav/DeleteMethod.java    | 10 +++-------
 .../http/{ => methods}/nonwebdav/GetMethod.java       | 10 +++-------
 .../http/{ => methods}/nonwebdav/HttpMethod.java      | 10 ++++++++--
 .../http/{ => methods}/nonwebdav/PostMethod.java      | 10 +++-------
 .../http/{ => methods}/nonwebdav/PutMethod.java       | 10 +++-------
 .../common/http/{ => methods}/webdav/DavMethod.java   |  2 +-
 .../http/{ => methods}/webdav/PropfindMethod.java     |  6 +++---
 .../files/ExistenceCheckRemoteOperation.java          |  2 +-
 .../resources/files/ReadRemoteFolderOperation.java    |  2 +-
 .../resources/shares/CreateRemoteShareOperation.java  |  2 +-
 .../lib/resources/shares/GetRemoteShareOperation.java |  2 +-
 .../resources/shares/GetRemoteShareesOperation.java   |  2 +-
 .../shares/GetRemoteSharesForFileOperation.java       |  2 +-
 .../resources/shares/GetRemoteSharesOperation.java    |  2 +-
 .../resources/shares/RemoveRemoteShareOperation.java  |  2 +-
 .../resources/shares/UpdateRemoteShareOperation.java  |  2 +-
 .../status/GetRemoteCapabilitiesOperation.java        |  2 +-
 .../resources/status/GetRemoteStatusOperation.java    |  4 ++--
 .../resources/users/GetRemoteUserAvatarOperation.java |  2 +-
 .../resources/users/GetRemoteUserInfoOperation.java   |  3 +--
 26 files changed, 54 insertions(+), 61 deletions(-)
 rename src/com/owncloud/android/lib/common/{ => http}/interceptors/BasicAuthInterceptor.java (96%)
 rename src/com/owncloud/android/lib/common/{ => http}/interceptors/HttpInterceptor.java (98%)
 rename src/com/owncloud/android/lib/common/{ => http}/interceptors/UserAgentInterceptor.java (96%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/DeleteMethod.java (87%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/GetMethod.java (87%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/HttpMethod.java (89%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/PostMethod.java (87%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/PutMethod.java (87%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/webdav/DavMethod.java (96%)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/webdav/PropfindMethod.java (94%)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 3a6ca848..f99d139d 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -33,8 +33,8 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
-import com.owncloud.android.lib.common.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.interceptors.UserAgentInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -59,7 +59,6 @@ import java.util.Arrays;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
-import okhttp3.Response;
 
 public class OwnCloudClient extends HttpClient {
 
@@ -719,4 +718,4 @@ public class OwnCloudClient extends HttpClient {
                 (mRedirectedLocation.toUpperCase().contains("SAML") ||
                         mRedirectedLocation.toLowerCase().contains("wayf")));
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 6650219d..7a1fdb65 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -24,8 +24,8 @@
 package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.interceptors.HttpInterceptor.RequestInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
 
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;
diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index 78d92795..82f07431 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import okhttp3.Headers;
+import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.internal.http2.Header;
@@ -43,10 +44,15 @@ import okhttp3.internal.http2.Header;
  */
 public abstract class HttpBaseMethod {
     public abstract int execute() throws Exception;
+    protected Request mRequest;
     protected Response mResponse;
-    private static final String TAG = HttpBaseMethod.class.getSimpleName();
 
-    // Status
+    // Request
+    public Headers getRequestHeaders() {
+        return mRequest.headers();
+    }
+
+    // Response
     public int getStatusCode() {
         return mResponse.code();
     }
@@ -55,7 +61,6 @@ public abstract class HttpBaseMethod {
         return mResponse.message();
     }
 
-    // Response
     public String getResponseBodyAsString() throws IOException {
         return mResponse.body().string();
     }
diff --git a/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
similarity index 96%
rename from src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java
rename to src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
index 152b7c20..171f6fab 100644
--- a/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.interceptors;
+package com.owncloud.android.lib.common.http.interceptors;
 
 import okhttp3.Request;
 
diff --git a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
similarity index 98%
rename from src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
rename to src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
index 560fe86a..95d06506 100644
--- a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.interceptors;
+package com.owncloud.android.lib.common.http.interceptors;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java
similarity index 96%
rename from src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java
rename to src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java
index bd46fc0f..b57b4fed 100644
--- a/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.interceptors;
+package com.owncloud.android.lib.common.http.interceptors;
 
 import okhttp3.Request;
 
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
similarity index 87%
rename from src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
index cdbf4ef6..5d47758c 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
@@ -22,11 +22,10 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * OkHttp delete calls wrapper
@@ -40,13 +39,10 @@ public class DeleteMethod extends HttpMethod{
 
     @Override
     public int execute() throws Exception {
-        Request request = mRequest
-                .newBuilder()
+        mRequest.newBuilder()
                 .delete()
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
-
-        return mResponse.code();
+        return super.executeRequest();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
similarity index 87%
rename from src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index f0246139..0f74252c 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -22,13 +22,12 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
 
 /**
  * OkHttp get calls wrapper
@@ -46,13 +45,10 @@ public class GetMethod extends HttpMethod {
 
     @Override
     public int execute() throws IOException {
-        Request request = mRequest
-                .newBuilder()
+        mRequest.newBuilder()
                 .get()
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
-
-        return mResponse.code();
+        return super.executeRequest();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
similarity index 89%
rename from src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 73912194..5ed95ec7 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -22,10 +22,12 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 
+import java.io.IOException;
+
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -37,7 +39,6 @@ import okhttp3.Request;
  */
 public abstract class HttpMethod extends HttpBaseMethod {
     protected OkHttpClient mOkHttpClient;
-    protected Request mRequest;
 
     public HttpMethod(OkHttpClient okHttpClient, String httpUrl) {
         mOkHttpClient = okHttpClient;
@@ -64,4 +65,9 @@ public abstract class HttpMethod extends HttpBaseMethod {
         mRequest.newBuilder()
                 .header(name, value);
     }
+
+    public int executeRequest() throws IOException {
+        mResponse = mOkHttpClient.newCall(mRequest).execute();
+        return super.getStatusCode();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
similarity index 87%
rename from src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
index 8defb0e6..91939029 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
@@ -22,12 +22,11 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
 
 /**
  * OkHttp post calls wrapper
@@ -44,13 +43,10 @@ public class PostMethod extends HttpMethod {
 
     @Override
     public int execute() throws Exception {
-        Request request = mRequest
-                .newBuilder()
+        mRequest.newBuilder()
                 .post(mRequestBody)
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
-
-        return mResponse.code();
+        return super.executeRequest();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
similarity index 87%
rename from src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
index 854cb95d..f7270f35 100644
--- a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
@@ -22,12 +22,11 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
 
 public class PutMethod extends HttpMethod{
 
@@ -40,13 +39,10 @@ public class PutMethod extends HttpMethod{
 
     @Override
     public int execute() throws Exception {
-        Request request = mRequest
-                .newBuilder()
+        mRequest.newBuilder()
                 .put(mRequestBody)
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
-
-        return mResponse.code();
+        return super.executeRequest();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
similarity index 96%
rename from src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index cf10aabb..de75047a 100644
--- a/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.webdav;
+package com.owncloud.android.lib.common.http.methods.webdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 
diff --git a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
similarity index 94%
rename from src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index d8737714..e8b85564 100644
--- a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.webdav;
+package com.owncloud.android.lib.common.http.methods.webdav;
 
 import java.io.IOException;
 import java.util.Set;
@@ -34,7 +34,6 @@ import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
-import okhttp3.Response;
 
 /**
  * Propfind calls wrapper
@@ -59,9 +58,10 @@ public class PropfindMethod extends DavMethod {
             // Do nothing, we will use the 401 code to handle the situation
         }
 
+        mRequest = mDavResource.getRequest();
         mResponse = mDavResource.getResponse();
 
-        return mResponse.code();
+        return super.getStatusCode();
     }
 
     public int getDepth() {
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 13831be6..93b4ced4 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -26,7 +26,7 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 8c699fb3..d8b9bcf4 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -26,7 +26,7 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 12f5ed0e..669df7b8 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.PostMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index 17e706be..c7c2df93 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -30,7 +30,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 8f045f14..ba49698a 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -32,7 +32,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index 244c3a56..95bc2019 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 84e92cfa..436448db 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -29,7 +29,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index 403d2002..ca4f3cea 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.DeleteMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 563e629d..9c04085d 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -29,7 +29,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.PutMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 3b6f7c0d..849cdf21 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index e826ce71..0c54a162 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -30,7 +30,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -99,7 +99,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 //                );
 //                get.releaseConnection();
 //                get = new GetMethod(redirectedLocation);
-//                status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
+//                status = client.executeRequest(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
 //                mLatestResult = new RemoteOperationResult(
 //                    (status == HttpStatus.SC_OK),
 //                    get
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 8619a73c..187d4ce2 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -26,7 +26,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index e5bc60f6..be2d98d8 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -31,10 +31,9 @@ import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 
 import okhttp3.Request;
-import okhttp3.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 

From 1631b9b55a107767e7d5f8c7febf2c1897a12647 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 11 Jun 2018 15:05:16 +0200
Subject: [PATCH 051/133] Get rid of OkHttp dependencies in OwnCloudClient

---
 .../android/lib/common/OwnCloudClient.java    | 58 ++--------------
 .../lib/common/OwnCloudClientFactory.java     | 11 +--
 .../lib/common/SingleSessionManager.java      |  7 +-
 .../OwnCloudBasicCredentials.java             |  9 ++-
 .../OwnCloudSamlSsoCredentials.java           |  4 +-
 .../lib/common/http/HttpBaseMethod.java       |  8 ++-
 .../android/lib/common/http/HttpClient.java   | 67 +++++++++++++++++++
 .../android/lib/common/http/HttpUtils.java    | 37 ++++++++++
 .../interceptors/BasicAuthInterceptor.java    |  5 +-
 .../http/methods/nonwebdav/DeleteMethod.java  |  7 +-
 .../http/methods/nonwebdav/GetMethod.java     |  9 ++-
 .../http/methods/nonwebdav/HttpMethod.java    | 10 ++-
 .../http/methods/nonwebdav/PostMethod.java    |  6 +-
 .../http/methods/nonwebdav/PutMethod.java     |  6 +-
 .../common/http/methods/webdav/DavMethod.java |  9 ++-
 .../http/methods/webdav/PropfindMethod.java   |  5 +-
 .../files/ExistenceCheckRemoteOperation.java  |  4 +-
 .../files/ReadRemoteFolderOperation.java      |  1 -
 .../shares/CreateRemoteShareOperation.java    |  3 +-
 .../shares/GetRemoteShareOperation.java       |  4 +-
 .../shares/GetRemoteShareesOperation.java     |  2 +-
 .../GetRemoteSharesForFileOperation.java      |  2 +-
 .../shares/GetRemoteSharesOperation.java      |  4 +-
 .../shares/RemoveRemoteShareOperation.java    |  4 +-
 .../shares/UpdateRemoteShareOperation.java    | 12 ++--
 .../GetRemoteCapabilitiesOperation.java       |  2 +-
 .../status/GetRemoteStatusOperation.java      |  8 ++-
 .../users/GetRemoteUserAvatarOperation.java   |  2 +-
 .../users/GetRemoteUserInfoOperation.java     |  2 +-
 29 files changed, 177 insertions(+), 131 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/HttpClient.java
 create mode 100644 src/com/owncloud/android/lib/common/http/HttpUtils.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index f99d139d..6c8a5652 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -33,8 +33,6 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -55,10 +53,6 @@ import org.apache.commons.httpclient.params.HttpParams;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
 
 public class OwnCloudClient extends HttpClient {
 
@@ -103,9 +97,6 @@ public class OwnCloudClient extends HttpClient {
 
     private String mRedirectedLocation;
 
-    private static OkHttpClient mOkHttpClient = null;
-    private static HttpInterceptor mOkHttpInterceptor = null;
-
     /**
      * Constructor
      */
@@ -144,14 +135,6 @@ public class OwnCloudClient extends HttpClient {
 
         super(connectionMgr);
 
-        if (mOkHttpClient == null) {
-            mOkHttpClient = new OkHttpClient.Builder()
-                    .addInterceptor(getBaseOkHttpInterceptor())
-                    .protocols(Arrays.asList(Protocol.HTTP_1_1))
-                    .followRedirects(false)
-                    .build();
-        }
-
         if (baseUri == null) {
             throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
         }
@@ -172,24 +155,6 @@ public class OwnCloudClient extends HttpClient {
         clearCredentials();
     }
 
-    /**
-     * {@link HttpInterceptor} singleton
-     * @return {@link HttpInterceptor} instance with user agent
-     */
-    public HttpInterceptor getBaseOkHttpInterceptor() {
-
-        if (mOkHttpInterceptor == null) {
-            mOkHttpInterceptor = new HttpInterceptor().
-                    addRequestInterceptor(
-                            new UserAgentInterceptor(
-                                    OwnCloudClientManagerFactory.getUserAgent()
-                            )
-                    );
-        }
-
-        return mOkHttpInterceptor;
-    }
-
     private void applyProxySettings() {
         String proxyHost = System.getProperty("http.proxyHost");
         String proxyPortSt = System.getProperty("http.proxyPort");
@@ -291,9 +256,10 @@ public class OwnCloudClient extends HttpClient {
 
             checkFirstRedirection(method);
 
-            if (mOkHttpClient.followRedirects()) {
-                status = followRedirection(method).getLastStatus();
-            }
+            // TODO
+//            if (mOkHttpClient.followRedirects()) {
+//                status = followRedirection(method).getLastStatus();
+//            }
 
             repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
             if (repeatWithFreshCredentials) {
@@ -483,18 +449,6 @@ public class OwnCloudClient extends HttpClient {
         return mCredentials;
     }
 
-    public void setFollowRedirects(boolean followRedirects) {
-        mOkHttpClient
-                .newBuilder()
-                .followRedirects(followRedirects)
-                .followSslRedirects(followRedirects)
-                .build();
-    }
-
-    public boolean getFollowRedirects() {
-        return mOkHttpClient.followRedirects();
-    }
-
     private void logCookiesAtRequest(Header[] headers, String when) {
         int counter = 0;
         for (int i = 0; i < headers.length; i++) {
@@ -597,10 +551,6 @@ public class OwnCloudClient extends HttpClient {
         return mAccount;
     }
 
-    public OkHttpClient getOkHttpClient() {
-        return mOkHttpClient;
-    }
-
     /**
      * Enables or disables silent refresh of credentials, if supported by credentials themselves.
      */
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index ff9e32b0..89b45bce 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -40,6 +40,7 @@ import android.os.Bundle;
 import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -175,11 +176,13 @@ public class OwnCloudClientFactory {
         
         OwnCloudClient client = new OwnCloudClient(uri, NetworkUtils.getMultiThreadedConnManager());
         client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
-        client.setFollowRedirects(followRedirects);
+
+        HttpClient.getOkHttpClient()
+                .newBuilder()
+                .followRedirects(followRedirects);
+
         client.setContext(context);
         
         return client;
     }
-    
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 05396480..ae422550 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -45,7 +45,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 /**
  * Implementation of {@link OwnCloudClientManager}
- * <p>
+ *
  * TODO check multithreading safety
  *
  * @author David A. Velasco
@@ -232,8 +232,5 @@ public class SingleSessionManager implements OwnCloudClientManager {
         if (!recentUri.equals(reusedClient.getBaseUri())) {
             reusedClient.setBaseUri(recentUri);
         }
-
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 7a1fdb65..ee0bf6bb 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -24,6 +24,7 @@
 package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
 
@@ -36,8 +37,6 @@ import org.apache.commons.httpclient.auth.BasicScheme;
 import java.util.ArrayList;
 import java.util.List;
 
-import okhttp3.Credentials;
-
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
     private static final String TAG = OwnCloudCredentials.class.getSimpleName();
@@ -65,7 +64,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         List<String> authPrefs = new ArrayList<>(1);
         authPrefs.add(AuthPolicy.BASIC);
 
-        ArrayList<RequestInterceptor> requestInterceptors = client.getBaseOkHttpInterceptor().getRequestInterceptors();
+        ArrayList<RequestInterceptor> requestInterceptors = HttpClient.getOkHttpInterceptor().getRequestInterceptors();
 
         // Clear previous basic credentials
         for (RequestInterceptor requestInterceptor : requestInterceptors) {
@@ -74,9 +73,9 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
             }
         }
 
-        client.getBaseOkHttpInterceptor()
+        HttpClient.getOkHttpInterceptor()
                 .addRequestInterceptor(
-                        new BasicAuthInterceptor(Credentials.basic(mUsername, mPassword))
+                        new BasicAuthInterceptor(mUsername, mPassword)
                 );
 
         //TODO Update from here down
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 0f475428..cf7036b0 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -45,7 +45,9 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
         client.getParams().setAuthenticationPreemptive(false);
         client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
         client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
-        client.setFollowRedirects(false);
+
+        // TODO
+//        client.setFollowRedirects(false);
 
         Uri serverUri = client.getBaseUri();
 
diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index 82f07431..122e0650 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -24,8 +24,6 @@
 
 package com.owncloud.android.lib.common.http;
 
-import com.owncloud.android.lib.common.utils.Log_OC;
-
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -33,7 +31,6 @@ import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import okhttp3.internal.http2.Header;
 
 /**
  * Wrapper to perform http calls transparently by using:
@@ -44,9 +41,14 @@ import okhttp3.internal.http2.Header;
  */
 public abstract class HttpBaseMethod {
     public abstract int execute() throws Exception;
+    protected OkHttpClient mOkHttpClient;
     protected Request mRequest;
     protected Response mResponse;
 
+    public HttpBaseMethod () {
+        mOkHttpClient = HttpClient.getOkHttpClient();
+    }
+
     // Request
     public Headers getRequestHeaders() {
         return mRequest.headers();
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
new file mode 100644
index 00000000..52bf9227
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -0,0 +1,67 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http;
+
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
+
+import java.util.Arrays;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+
+/**
+ * Client used to perform network operations
+ * @author David González Verdugo
+ */
+public class HttpClient {
+
+    private static OkHttpClient mOkHttpClient;
+    private static HttpInterceptor mOkHttpInterceptor;
+
+    public static OkHttpClient getOkHttpClient() {
+        if (mOkHttpClient == null) {
+
+            mOkHttpInterceptor = new HttpInterceptor()
+                    .addRequestInterceptor(new UserAgentInterceptor(
+                                    // TODO Try to get rid of this dependency
+                                    OwnCloudClientManagerFactory.getUserAgent()
+                            )
+                    );
+
+            mOkHttpClient = new OkHttpClient.Builder()
+                    .addInterceptor(mOkHttpInterceptor)
+                    .protocols(Arrays.asList(Protocol.HTTP_1_1))
+                    .followRedirects(false)
+                    .build();
+        }
+        return mOkHttpClient;
+    }
+
+    public static HttpInterceptor getOkHttpInterceptor() {
+        return mOkHttpInterceptor;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/HttpUtils.java b/src/com/owncloud/android/lib/common/http/HttpUtils.java
new file mode 100644
index 00000000..588d5aa3
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/HttpUtils.java
@@ -0,0 +1,37 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http;
+
+import okhttp3.HttpUrl;
+
+/**
+ * @author David González Verdugo
+ */
+public class HttpUtils {
+
+    public static HttpUrl stringUrlToHttpUrl(String url) {
+        return HttpUrl.parse(url);
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
index 171f6fab..a61a33fd 100644
--- a/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
@@ -24,6 +24,7 @@
 
 package com.owncloud.android.lib.common.http.interceptors;
 
+import okhttp3.Credentials;
 import okhttp3.Request;
 
 public class BasicAuthInterceptor implements HttpInterceptor.RequestInterceptor {
@@ -31,8 +32,8 @@ public class BasicAuthInterceptor implements HttpInterceptor.RequestInterceptor
     private static final String AUTHORIZATION_HEADER = "Authorization";
     private String mCredentials;
 
-    public BasicAuthInterceptor(String credentials) {
-        mCredentials = credentials;
+    public BasicAuthInterceptor(String username, String password) {
+        mCredentials = Credentials.basic(username, password);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
index 5d47758c..24c3d2a8 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
@@ -24,17 +24,14 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-
 /**
  * OkHttp delete calls wrapper
  * @author David González Verdugo
  */
 public class DeleteMethod extends HttpMethod{
 
-    public DeleteMethod(OkHttpClient okHttpClient, String httpUrl) {
-        super(okHttpClient, httpUrl);
+    public DeleteMethod(String httpUrl) {
+        super(httpUrl);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index 0f74252c..a1a117ed 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -27,7 +27,6 @@ package com.owncloud.android.lib.common.http.methods.nonwebdav;
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 
 /**
  * OkHttp get calls wrapper
@@ -35,12 +34,12 @@ import okhttp3.OkHttpClient;
  */
 public class GetMethod extends HttpMethod {
 
-    public GetMethod(OkHttpClient okHttpClient, String httpUrl) {
-        super(okHttpClient, httpUrl);
+    public GetMethod(String httpUrl) {
+        super(httpUrl);
     }
 
-    public GetMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
-        super(okHttpClient, httpUrl);
+    public GetMethod(HttpUrl httpUrl) {
+        super(httpUrl);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 5ed95ec7..7d3ddb5a 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -29,7 +29,6 @@ import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
 /**
@@ -38,17 +37,16 @@ import okhttp3.Request;
  * @author David González Verdugo
  */
 public abstract class HttpMethod extends HttpBaseMethod {
-    protected OkHttpClient mOkHttpClient;
 
-    public HttpMethod(OkHttpClient okHttpClient, String httpUrl) {
-        mOkHttpClient = okHttpClient;
+    public HttpMethod(String httpUrl) {
+        super();
         mRequest = new Request.Builder()
                 .url(httpUrl)
                 .build();
     }
 
-    public HttpMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
-        mOkHttpClient = okHttpClient;
+    public HttpMethod(HttpUrl httpUrl) {
+        super();
         mRequest = new Request.Builder()
                 .url(httpUrl)
                 .build();
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
index 91939029..34e2aa5b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
@@ -24,8 +24,6 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import okhttp3.RequestBody;
 
 /**
@@ -36,8 +34,8 @@ public class PostMethod extends HttpMethod {
 
     private RequestBody mRequestBody;
 
-    public PostMethod(OkHttpClient okHttpClient, String httpUrl, RequestBody requestBody){
-        super(okHttpClient, httpUrl);
+    public PostMethod(String httpUrl, RequestBody requestBody){
+        super(httpUrl);
         mRequestBody = requestBody;
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
index f7270f35..04d9abd8 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
@@ -24,16 +24,14 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import okhttp3.RequestBody;
 
 public class PutMethod extends HttpMethod{
 
     private RequestBody mRequestBody;
 
-    public PutMethod(OkHttpClient okHttpClient, String httpUrl, RequestBody requestBody){
-        super(okHttpClient, httpUrl);
+    public PutMethod(String httpUrl, RequestBody requestBody){
+        super(httpUrl);
         mRequestBody = requestBody;
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index de75047a..eb26e2bd 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -29,7 +29,6 @@ import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 
 /**
  * Wrapper to perform WebDAV (dav4android) calls
@@ -39,8 +38,12 @@ public abstract class DavMethod extends HttpBaseMethod {
 
     protected DavResource mDavResource;
 
-    public DavMethod(OkHttpClient okHttpClient, HttpUrl httpUrl) {
-        mDavResource = new DavOCResource(okHttpClient, httpUrl);
+    public DavMethod(HttpUrl httpUrl) {
+        super();
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                httpUrl
+        );
     }
 
     public DavResource getDavResource() {
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index e8b85564..8e788f6c 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -33,7 +33,6 @@ import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 
 /**
  * Propfind calls wrapper
@@ -44,8 +43,8 @@ public class PropfindMethod extends DavMethod {
     private int mDepth;
     private Set<DavResource> mMembers;
 
-    public PropfindMethod(OkHttpClient okHttpClient, HttpUrl httpUrl, int depth) {
-        super(okHttpClient, httpUrl);
+    public PropfindMethod(HttpUrl httpUrl, int depth) {
+        super(httpUrl);
         mDepth = depth;
     };
 
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 93b4ced4..a71f941b 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -26,6 +26,7 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -81,8 +82,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
 //            client.setFollowRedirects(false);
             PropfindMethod propfindMethod = new PropfindMethod(
-                    client.getOkHttpClient(),
-                    HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
+                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0);
 
             int status = client.executeHttpMethod(propfindMethod);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index d8b9bcf4..f90a654d 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -74,7 +74,6 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
         try {
 
             PropfindMethod propfindMethod = new PropfindMethod(
-                    client.getOkHttpClient(),
                     HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     1);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 669df7b8..6e658374 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -231,8 +231,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            PostMethod postMethod = new PostMethod(client.getOkHttpClient(),
-                    uriBuilder.build().toString(), formBody);
+            PostMethod postMethod = new PostMethod(uriBuilder.build().toString(), formBody);
             postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index c7c2df93..87a8d975 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -63,8 +63,8 @@ public class GetRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(),
-                    uriBuilder.build().toString());
+            GetMethod getMethod = new GetMethod(uriBuilder.build().toString());
+
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
             int status = client.executeHttpMethod(getMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index ba49698a..4da1a810 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -130,7 +130,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
             uriBuilder.appendQueryParameter(PARAM_PAGE, String.valueOf(mPage));
             uriBuilder.appendQueryParameter(PARAM_PER_PAGE, String.valueOf(mPerPage));
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), uriBuilder.build().toString());
+            GetMethod getMethod = new GetMethod(uriBuilder.build().toString());
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index 95bc2019..02b36900 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -93,7 +93,7 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
             httpBuilder.addQueryParameter(PARAM_RESHARES, String.valueOf(mReshares));
             httpBuilder.addQueryParameter(PARAM_SUBFILES, String.valueOf(mSubfiles));
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), httpBuilder.build());
+            GetMethod getMethod = new GetMethod(httpBuilder.build());
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 436448db..796991fa 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -57,8 +57,7 @@ public class GetRemoteSharesOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(),
-                    uriBuilder.build().toString());
+            GetMethod getMethod = new GetMethod(uriBuilder.build().toString());
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
@@ -75,7 +74,6 @@ public class GetRemoteSharesOperation extends RemoteOperation {
             } else {
                 result = new RemoteOperationResult(getMethod);
             }
-
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Exception while getting remote shares ", e);
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index ca4f3cea..68510d37 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -72,8 +72,8 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(String.valueOf(mRemoteShareId));
 
-            DeleteMethod deleteMethod = new DeleteMethod(client.getOkHttpClient(),
-                    uriBuilder.build().toString());
+            DeleteMethod deleteMethod = new DeleteMethod(uriBuilder.build().toString());
+
             deleteMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(deleteMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 9c04085d..a7074c9e 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -40,8 +40,6 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import okhttp3.FormBody;
-import okhttp3.Request;
-
 
 /**
  * Updates parameters of an existing Share resource, known its remote ID.
@@ -199,17 +197,15 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
                 formBodyBuilder.add(PARAM_PERMISSIONS, Integer.toString(mPermissions));
             }
 
+            FormBody formBody = formBodyBuilder.build();
+
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            FormBody formBody = formBodyBuilder.build();
-
-            PutMethod putMethod = new PutMethod(client.getOkHttpClient(),
-                    uriBuilder.build().toString(), formBody);
-            putMethod.setRequestHeader("Content-Type",
-                    "application/x-www-form-urlencoded; charset=utf-8");
+            PutMethod putMethod = new PutMethod(uriBuilder.build().toString(), formBody);
+            putMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             putMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(putMethod);
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 849cdf21..e22663b2 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -130,7 +130,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
 
             String url = uriBuilder.build().toString();
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), url);
+            GetMethod getMethod = new GetMethod(url);
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 0c54a162..8cea17b6 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -29,6 +29,7 @@ import android.net.ConnectivityManager;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -78,8 +79,11 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         try {
             String url = baseUrlSt + OwnCloudClient.STATUS_PATH;
 
-            client.setFollowRedirects(false);
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), url);
+            HttpClient.getOkHttpClient()
+                    .newBuilder()
+                    .followRedirects(false);
+
+            GetMethod getMethod = new GetMethod(url);
 
             int status = client.executeHttpMethod(getMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 187d4ce2..4097f1f9 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -86,7 +86,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
             ;
             Log_OC.d(TAG, "avatar URI: " + url);
 
-            getMethod = new GetMethod(client.getOkHttpClient(), url);
+            getMethod = new GetMethod(url);
             int status = client.executeHttpMethod(getMethod);
 
             if (isSuccess(status)) {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index be2d98d8..a5ee07da 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -76,7 +76,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
 
             String url = client.getBaseUri() + OCS_ROUTE;
 
-            GetMethod getMethod = new GetMethod(client.getOkHttpClient(), url);
+            GetMethod getMethod = new GetMethod(url);
             int status = client.executeHttpMethod(getMethod);
 
             if (isSuccess(status)) {

From a0478826b4d87ac7b7d0070a10f60be37027a5bf Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 12 Jun 2018 12:19:38 +0200
Subject: [PATCH 052/133] Update GetRemoteUserQuotaOperation to use the recent
 wrapper with propfind

---
 .../lib/common/http/HttpConstants.java        |   3 +
 .../http/methods/webdav/DavConstants.java     |  33 ++++++
 .../common/http/methods/webdav/DavUtils.java  |  15 +++
 .../http/methods/webdav/PropfindMethod.java   |   8 +-
 .../files/ExistenceCheckRemoteOperation.java  |  59 +++++-----
 .../files/ReadRemoteFolderOperation.java      |  11 +-
 .../users/GetRemoteUserQuotaOperation.java    | 104 ++++++++----------
 7 files changed, 138 insertions(+), 95 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java
 create mode 100644 src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java

diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 563ea923..a8f7cfa9 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -24,6 +24,9 @@
 
 package com.owncloud.android.lib.common.http;
 
+/**
+ * @author David González Verdugo
+ */
 public class HttpConstants {
 
     /**
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java
new file mode 100644
index 00000000..7017e4fa
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java
@@ -0,0 +1,33 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+/**
+ * @author David González Verdugo
+ */
+public class DavConstants {
+    public static final int DEPTH_0 = 0;
+    public static final int DEPTH_1 = 1;
+}
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java
new file mode 100644
index 00000000..484c4ec1
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java
@@ -0,0 +1,15 @@
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import at.bitfire.dav4android.Property;
+import at.bitfire.dav4android.PropertyUtils;
+
+public class DavUtils {
+
+    public static final Property.Name[] getAllPropset() {
+        return PropertyUtils.INSTANCE.getAllPropSet();
+    }
+
+    public static final Property.Name[] getQuotaPropSet() {
+        return PropertyUtils.INSTANCE.getQuotaPropset();
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index 8e788f6c..0f4f5ad4 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.util.Set;
 
 import at.bitfire.dav4android.DavResource;
-import at.bitfire.dav4android.PropertyUtils;
+import at.bitfire.dav4android.Property;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
@@ -41,17 +41,19 @@ import okhttp3.HttpUrl;
 public class PropfindMethod extends DavMethod {
 
     private int mDepth;
+    private Property.Name[] mProperties;
     private Set<DavResource> mMembers;
 
-    public PropfindMethod(HttpUrl httpUrl, int depth) {
+    public PropfindMethod(HttpUrl httpUrl, int depth, Property.Name[] properties) {
         super(httpUrl);
         mDepth = depth;
+        mProperties = properties;
     };
 
     @Override
     public int execute() throws IOException, HttpException, DavException {
         try {
-            mDavResource.propfind(mDepth, PropertyUtils.INSTANCE.getAllPropSet());
+            mDavResource.propfind(mDepth, mProperties);
             mMembers = mDavResource.getMembers();
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index a71f941b..5be03204 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -1,22 +1,22 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2016 ownCloud GmbH.
- *   
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.resources.files;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -34,37 +35,40 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import okhttp3.HttpUrl;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
  * Operation to check the existence or absence of a path in a remote server.
- * 
+ *
  * @author David A. Velasco
  * @author David GonzálezVerdugo
  */
 public class ExistenceCheckRemoteOperation extends RemoteOperation {
-    
-    /** Maximum time to wait for a response from the server in MILLISECONDs.  */
+
+    /**
+     * Maximum time to wait for a response from the server in MILLISECONDs.
+     */
     public static final int TIMEOUT = 10000;
-    
+
     private static final String TAG = ExistenceCheckRemoteOperation.class.getSimpleName();
 
     private static final int FORBIDDEN_ERROR = 403;
     private static final int SERVICE_UNAVAILABLE_ERROR = 503;
-    
+
     private String mPath;
     private boolean mSuccessIfAbsent;
 
-    /** Sequence of redirections followed. Available only after executing the operation */
+    /**
+     * Sequence of redirections followed. Available only after executing the operation
+     */
     private RedirectionPath mRedirectionPath = null;
+
     /**
      * Full constructor. Success of the operation will depend upon the value of successIfAbsent.
      *
-     * @param remotePath        Path to append to the URL owned by the client instance.
-     * @param successIfAbsent   When 'true', the operation finishes in success if the path does
-     *                          NOT exist in the remote server (HTTP 404).
+     * @param remotePath      Path to append to the URL owned by the client instance.
+     * @param successIfAbsent When 'true', the operation finishes in success if the path does
+     *                        NOT exist in the remote server (HTTP 404).
      */
     public ExistenceCheckRemoteOperation(String remotePath, boolean successIfAbsent) {
         mPath = (remotePath != null) ? remotePath : "";
@@ -72,7 +76,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
     }
 
     @Override
-	protected RemoteOperationResult run(OwnCloudClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;
 
         // TODO Complete redirection stuff, although OkHttp should follow redirections by default
@@ -83,7 +87,8 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 //            client.setFollowRedirects(false);
             PropfindMethod propfindMethod = new PropfindMethod(
                     HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
-                    0);
+                    0,
+                    DavUtils.getAllPropset());
 
             int status = client.executeHttpMethod(propfindMethod);
 
@@ -108,32 +113,32 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
             Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
-                    "finished with HTTP status " + status + (!isSuccess(status)?"(FAIL)":""));
-            
+                    "finished with HTTP status " + status + (!isSuccess(status) ? "(FAIL)" : ""));
+
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());
-            
+
         } finally {
 //            client.setFollowRedirects(previousFollowRedirects);
         }
         return result;
-	}
+    }
 
     /**
      * Gets the sequence of redirections followed during the execution of the operation.
      *
-     * @return      Sequence of redirections followed, if any, or NULL if the operation was not executed.
+     * @return Sequence of redirections followed, if any, or NULL if the operation was not executed.
      */
     public RedirectionPath getRedirectionPath() {
         return mRedirectionPath;
     }
 
     /**
-     * @return      'True' if the operation was executed and at least one redirection was followed.
+     * @return 'True' if the operation was executed and at least one redirection was followed.
      */
     public boolean wasRedirected() {
         return (mRedirectionPath != null && mRedirectionPath.getRedirectionsCount() > 0);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index f90a654d..5da8c2df 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -26,6 +26,9 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.DavConstants;
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -35,7 +38,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.util.ArrayList;
 
 import at.bitfire.dav4android.DavResource;
-import okhttp3.HttpUrl;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -72,15 +74,14 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
         RemoteOperationResult result = null;
 
         try {
-
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUrl.parse(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
-                    1);
+                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    DavConstants.DEPTH_1,
+                    DavUtils.getAllPropset());
 
             int status = client.executeHttpMethod(propfindMethod);
 
             if (isSuccess(status)) {
-
                 ArrayList<Object> mFolderAndFiles = new ArrayList<>();
 
                 // parse data from remote folder
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 0ae91a43..9cdb9e1c 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -28,42 +28,36 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.network.WebdavEntry;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavConstants;
-import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.ArrayList;
 
+import at.bitfire.dav4android.PropertyCollection;
+import at.bitfire.dav4android.property.QuotaAvailableBytes;
+import at.bitfire.dav4android.property.QuotaUsedBytes;
+
+import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * @author marcello
  * @author David González Verdugo
  */
 public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
-    static public class Quota {
-
-        // Not computed yet, e.g. external storage mounted but folder sizes need scanning
-        public static final int PENDING_FREE_QUOTA = -1;
-
-        // Storage not accessible, e.g. external storage with no API to ask for the free space
-        public static final int UNKNOWN_FREE_QUOTA = -2;
-
-        // Quota using all the storage
-        public static final int UNLIMITED_FREE_QUOTA = -3;
+    static public class RemoteQuota {
 
         long mFree, mUsed, mTotal;
         double mRelative;
 
-        public Quota(long free, long used, long total, double relative) {
+        public RemoteQuota(long free, long used, long total, double relative) {
             mFree = free;
             mUsed = used;
             mTotal = total;
@@ -92,34 +86,31 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
-        PropFindMethod query = null;
 
         try {
-            // remote request
-            query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
-                    WebdavUtils.getQuotaPropSet(),
-                    DavConstants.DEPTH_0);
+            PropfindMethod propfindMethod = new PropfindMethod(
+                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    DEPTH_0,
+                    DavUtils.getQuotaPropSet()
+            );
 
-            int status = client.executeMethod(query);
+            int status = client.executeHttpMethod(propfindMethod);
 
             if (isSuccess(status)) {
-                // get data from remote folder
-                MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
-                Quota quota = readData(dataInServer, client);
+                RemoteQuota remoteQuota = readData(propfindMethod.getDavResource().getProperties());
 
-                // Result of the operation
-                result = new RemoteOperationResult(true, query);
+                result = new RemoteOperationResult(OK);
 
                 ArrayList<Object> data = new ArrayList<>();
-                data.add(quota);
+                data.add(remoteQuota);
 
                 // Add data to the result
                 if (result.isSuccess()) {
                     result.setData(data);
                 }
-            } else {
-                // synchronization failed
-                result = new RemoteOperationResult(false, query);
+
+            } else { // synchronization failed
+                result = new RemoteOperationResult(propfindMethod);
             }
 
         } catch (Exception e) {
@@ -127,8 +118,6 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
 
         } finally {
-            if (query != null)
-                query.releaseConnection();  // let the connection available for other methods
             if (result.isSuccess()) {
                 Log_OC.i(TAG, "Get quota from " + mRemotePath + ": " + result.getLogMessage());
             } else {
@@ -145,46 +134,41 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
     }
 
     private boolean isSuccess(int status) {
-        return status == HttpStatus.SC_MULTI_STATUS || status == HttpStatus.SC_OK;
+        return status == HttpConstants.HTTP_MULTI_STATUS || status == HttpConstants.HTTP_OK;
     }
 
     /**
      * Read the data retrieved from the server about the quota
      *
-     * @param remoteData Full response got from the server with the data of the quota
-     * @param client     Client instance to the remote server where the data were retrieved
-     * @return new Quota instance representing the data read from the server
+     * @param properties WebDAV properties containing quota data
+     * @return new {@link RemoteQuota} instance representing the data read from the server
      */
-    private Quota readData(MultiStatus remoteData, OwnCloudClient client) {
+    private RemoteQuota readData(PropertyCollection properties) {
 
-        // parse data from remote folder
-        WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getWebdavUri().getPath());
+        long quotaAvailable = properties.get(QuotaAvailableBytes.class).getQuotaAvailableBytes();
+        long quotaUsed = properties.get(QuotaUsedBytes.class).getQuotaUsedBytes();
 
-        // If there's a special case, available bytes will contain a negative code
+        // If there's a special case, quota available will contain a negative code
         // -1, PENDING: Not computed yet, e.g. external storage mounted but folder sizes need scanning
         // -2, UNKNOWN: Storage not accessible, e.g. external storage with no API to ask for the free space
         // -3, UNLIMITED: Quota using all the storage
-        if (we.quotaAvailableBytes().compareTo(new BigDecimal(1)) == -1) {
-            return new Quota(
-                    we.quotaAvailableBytes().longValue(),
-                    we.quotaUsedBytes().longValue(),
+        if (quotaAvailable < 0) {
+            return new RemoteQuota(
+                    quotaAvailable,
+                    quotaUsed,
                     0,
                     0
             );
-
         } else {
+            long totalQuota = quotaAvailable + quotaUsed;
+            double relativeQuota = (double)(quotaUsed * 100)/totalQuota;
+            double roundedRelativeQuota = Math.round(relativeQuota * 100)/100.0d;
 
-            BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
-
-            BigDecimal relativeQuota = we.quotaUsedBytes()
-                    .multiply(new BigDecimal(100))
-                    .divide(totalQuota, 2, RoundingMode.HALF_UP);
-
-            return new Quota(
-                    we.quotaAvailableBytes().longValue(),
-                    we.quotaUsedBytes().longValue(),
-                    totalQuota.longValue(),
-                    relativeQuota.doubleValue()
+            return new RemoteQuota(
+                    quotaAvailable,
+                    quotaUsed,
+                    totalQuota,
+                    roundedRelativeQuota
             );
         }
     }

From c676f694d6e12188b7ed51200e70484bc3c78e2c Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 12 Jun 2018 13:48:44 +0200
Subject: [PATCH 053/133] Upload [WIP]

---
 .../lib/common/http/HttpBaseMethod.java       | 18 +++-
 .../http/methods/nonwebdav/HttpMethod.java    | 24 +-----
 .../common/http/methods/webdav/DavMethod.java |  2 +-
 .../common/http/methods/webdav/PutMethod.java | 73 ++++++++++++++++
 .../files/ReadRemoteFolderOperation.java      |  3 +-
 .../files/UploadRemoteFileOperation.java      | 86 +++++++++++--------
 6 files changed, 141 insertions(+), 65 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java

diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
index 122e0650..cdf02498 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import okhttp3.Headers;
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -45,8 +46,11 @@ public abstract class HttpBaseMethod {
     protected Request mRequest;
     protected Response mResponse;
 
-    public HttpBaseMethod () {
+    public HttpBaseMethod (HttpUrl httpUrl) {
         mOkHttpClient = HttpClient.getOkHttpClient();
+        mRequest = new Request.Builder()
+                .url(httpUrl)
+                .build();
     }
 
     // Request
@@ -54,6 +58,18 @@ public abstract class HttpBaseMethod {
         return mRequest.headers();
     }
 
+    // Request headers
+    public void addRequestHeader(String name, String value) {
+        mRequest.newBuilder()
+                .addHeader(name, value)
+                .build();
+    }
+
+    public void setRequestHeader(String name, String value){
+        mRequest.newBuilder()
+                .header(name, value);
+    }
+
     // Response
     public int getStatusCode() {
         return mResponse.code();
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 7d3ddb5a..0fbd3ab3 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -38,30 +38,8 @@ import okhttp3.Request;
  */
 public abstract class HttpMethod extends HttpBaseMethod {
 
-    public HttpMethod(String httpUrl) {
-        super();
-        mRequest = new Request.Builder()
-                .url(httpUrl)
-                .build();
-    }
-
     public HttpMethod(HttpUrl httpUrl) {
-        super();
-        mRequest = new Request.Builder()
-                .url(httpUrl)
-                .build();
-    }
-
-    // Request headers
-    public void addRequestHeader(String name, String value) {
-        mRequest.newBuilder()
-                .addHeader(name, value)
-                .build();
-    }
-
-    public void setRequestHeader(String name, String value){
-        mRequest.newBuilder()
-                .header(name, value);
+        super(httpUrl);
     }
 
     public int executeRequest() throws IOException {
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index eb26e2bd..fcae6b64 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -36,7 +36,7 @@ import okhttp3.HttpUrl;
  */
 public abstract class DavMethod extends HttpBaseMethod {
 
-    protected DavResource mDavResource;
+    protected DavOCResource mDavResource;
 
     public DavMethod(HttpUrl httpUrl) {
         super();
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
new file mode 100644
index 00000000..8323485b
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -0,0 +1,73 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import java.io.IOException;
+
+import at.bitfire.dav4android.exception.DavException;
+import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.exception.UnauthorizedException;
+import okhttp3.HttpUrl;
+import okhttp3.RequestBody;
+
+/**
+ * Put calls wrapper
+ * @author David González Verdugo
+ */
+public class PutMethod extends DavMethod {
+
+    private RequestBody mRequestBody;
+    private String mIfMatchETag;
+    private boolean mIfNoneMatch;
+    private String mContentType;
+    private String mOcTotalLength;
+    private String mOcXOcMtimeHeader;
+
+    public PutMethod(HttpUrl httpUrl) {
+        super(httpUrl);
+    };
+
+    @Override
+    public int execute() throws IOException, HttpException, DavException {
+        try {
+            mDavResource.put(
+                    mRequestBody,
+                    mIfMatchETag,
+                    mIfNoneMatch,
+                    mContentType,
+                    mOcTotalLength,
+                    mOcXOcMtimeHeader
+            );
+
+            mRequest = mDavResource.getRequest();
+            mResponse = mDavResource.getResponse();
+
+        } catch (UnauthorizedException davException) {
+            // Do nothing, we will use the 401 code to handle the situation
+        }
+
+        return super.getStatusCode();
+    }
+}
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 5da8c2df..feb910c8 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -99,8 +99,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
                 result = new RemoteOperationResult(OK);
                 result.setData(mFolderAndFiles);
 
-            } else {
-                // synchronization failed
+            } else { // synchronization failed
                 result = new RemoteOperationResult(propfindMethod);
             }
 
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 6c232542..608b53db 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.network.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
@@ -32,10 +33,10 @@ import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
 
 import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 
@@ -45,6 +46,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * Remote operation performing the upload of a remote file to the ownCloud server.
  * 
@@ -90,17 +93,20 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
-        DefaultHttpMethodRetryHandler oldRetryHandler =
-            (DefaultHttpMethodRetryHandler) client.getParams().getParameter(HttpMethodParams.RETRY_HANDLER);
+
+//        DefaultHttpMethodRetryHandler oldRetryHandler =
+//            (DefaultHttpMethodRetryHandler) client.getParams().getParameter(HttpMethodParams.RETRY_HANDLER);
 
         try {
+            // TODO
             // prevent that uploads are retried automatically by network library
-            client.getParams().setParameter(
-                HttpMethodParams.RETRY_HANDLER,
-                new DefaultHttpMethodRetryHandler(0, false)
-            );
+//            client.getParams().setParameter(
+//                HttpMethodParams.RETRY_HANDLER,
+//                new DefaultHttpMethodRetryHandler(0, false)
+//            );
 
-            mPutMethod = new PutMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
+            mPutMethod = new PutMethod(
+                    HttpUtils.stringUrlToHttpUrl(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)));
 
             if (mCancellationRequested.get()) {
                 // the operation was cancelled before getting it's turn to be executed in the queue of uploads
@@ -112,18 +118,18 @@ public class UploadRemoteFileOperation extends RemoteOperation {
             }
 
         } catch (Exception e) {
-            if (mPutMethod != null && mPutMethod.isAborted()) {
-                result = new RemoteOperationResult(new OperationCancelledException());
-
-            } else {
-                result = new RemoteOperationResult(e);
-            }
+//            if (mPutMethod != null && mPutMethod.isAborted()) {
+//                result = new RemoteOperationResult(new OperationCancelledException());
+//
+//            } else {
+//                result = new RemoteOperationResult(e);
+//            }
         } finally {
             // reset previous retry handler
-            client.getParams().setParameter(
-                HttpMethodParams.RETRY_HANDLER,
-                oldRetryHandler
-            );
+//            client.getParams().setParameter(
+//                HttpMethodParams.RETRY_HANDLER,
+//                oldRetryHandler
+//            );
         }
         return result;
     }
@@ -134,33 +140,37 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     }
 
     protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
-        int status;
         RemoteOperationResult result;
         try {
             File f = new File(mLocalPath);
-            mEntity  = new FileRequestEntity(f, mMimeType);
-            synchronized (mDataTransferListeners) {
-                ((ProgressiveDataTransferer)mEntity)
-                        .addDatatransferProgressListeners(mDataTransferListeners);
-            }
+
+            // TODO
+//            synchronized (mDataTransferListeners) {
+//                ((ProgressiveDataTransferer)mEntity)
+//                        .addDatatransferProgressListeners(mDataTransferListeners);
+//            }
+
             if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
                 mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
             }
+
             mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(f.length()));
 
             mPutMethod.addRequestHeader(OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
 
-            mPutMethod.setRequestEntity(mEntity);
-            status = client.executeMethod(mPutMethod);
+            int status = client.executeHttpMethod(mPutMethod);
 
-            result = new RemoteOperationResult(
-                isSuccess(status),
-                mPutMethod
-            );
-            client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
+            if (isSuccess(status)) {
+                result = new RemoteOperationResult(OK);
 
-        } finally {
-            mPutMethod.releaseConnection(); // let the connection available for other methods
+            } else { // synchronization failed
+                result = new RemoteOperationResult(mPutMethod);
+            }
+
+            client.exhaustResponse(mPutMethod.getResponseAsStream());
+
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
         }
         return result;
     }
@@ -188,10 +198,10 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     }
     
     public void cancel() {
-        synchronized (mCancellationRequested) {
-            mCancellationRequested.set(true);
-            if (mPutMethod != null)
-                mPutMethod.abort();
-        }
+//        synchronized (mCancellationRequested) {
+//            mCancellationRequested.set(true);
+//            if (mPutMethod != null)
+//                mPutMethod.abort();
+//        }
     }
 }
\ No newline at end of file

From 524dc587db7ae6f11c19f56b6a772a24e75a6d20 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 12 Jun 2018 17:42:32 +0200
Subject: [PATCH 054/133] Refactor wrapper constructors and start to implement
 uploadoperations in library

---
 dav4android                                   |   2 +-
 .../android/lib/common/OwnCloudClient.java    |   2 +-
 .../http/{ => methods}/HttpBaseMethod.java    |   7 +-
 .../http/methods/nonwebdav/DeleteMethod.java  |  12 +-
 .../http/methods/nonwebdav/GetMethod.java     |   8 +-
 .../http/methods/nonwebdav/HttpMethod.java    |   6 +-
 .../http/methods/nonwebdav/PostMethod.java    |  11 +-
 .../http/methods/nonwebdav/PutMethod.java     |  11 +-
 .../common/http/methods/webdav/DavMethod.java |   6 +-
 .../common/http/methods/webdav/PutMethod.java |   2 +-
 .../lib/common/network/WebdavUtils.java       |   6 +-
 .../operations/RemoteOperationResult.java     |   2 +-
 .../ChunkedUploadRemoteFileOperation.java     | 146 +++++++++---------
 .../files/UploadRemoteFileOperation.java      |  11 +-
 .../shares/CreateRemoteShareOperation.java    |   7 +-
 .../shares/GetRemoteShareOperation.java       |   7 +-
 .../shares/GetRemoteShareesOperation.java     |   6 +-
 .../shares/GetRemoteSharesOperation.java      |   6 +-
 .../shares/RemoveRemoteShareOperation.java    |   4 +-
 .../shares/UpdateRemoteShareOperation.java    |   7 +-
 .../GetRemoteCapabilitiesOperation.java       |   6 +-
 .../status/GetRemoteStatusOperation.java      |   7 +-
 .../users/GetRemoteUserAvatarOperation.java   |   6 +-
 .../users/GetRemoteUserInfoOperation.java     |  14 +-
 24 files changed, 172 insertions(+), 130 deletions(-)
 rename src/com/owncloud/android/lib/common/http/{ => methods}/HttpBaseMethod.java (94%)

diff --git a/dav4android b/dav4android
index 054d7b57..466380e9 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 054d7b57b27d7c258d717c8a326eed89e195d168
+Subproject commit 466380e9bb8414d919391dbb14de7926dbfd387e
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 6c8a5652..2cad64c6 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -33,7 +33,7 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
-import com.owncloud.android.lib.common.http.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
similarity index 94%
rename from src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
rename to src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index cdf02498..2886dcc3 100644
--- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -22,7 +22,9 @@
  *
  */
 
-package com.owncloud.android.lib.common.http;
+package com.owncloud.android.lib.common.http.methods;
+
+import com.owncloud.android.lib.common.http.HttpClient;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +48,7 @@ public abstract class HttpBaseMethod {
     protected Request mRequest;
     protected Response mResponse;
 
-    public HttpBaseMethod (HttpUrl httpUrl) {
+    protected HttpBaseMethod (HttpUrl httpUrl) {
         mOkHttpClient = HttpClient.getOkHttpClient();
         mRequest = new Request.Builder()
                 .url(httpUrl)
@@ -58,7 +60,6 @@ public abstract class HttpBaseMethod {
         return mRequest.headers();
     }
 
-    // Request headers
     public void addRequestHeader(String name, String value) {
         mRequest.newBuilder()
                 .addHeader(name, value)
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
index 24c3d2a8..9ed7307a 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
@@ -24,22 +24,26 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
+import java.io.IOException;
+
+import okhttp3.HttpUrl;
+
 /**
  * OkHttp delete calls wrapper
  * @author David González Verdugo
  */
 public class DeleteMethod extends HttpMethod{
 
-    public DeleteMethod(String httpUrl) {
+    public DeleteMethod(HttpUrl httpUrl) {
         super(httpUrl);
     }
 
     @Override
-    public int execute() throws Exception {
-        mRequest.newBuilder()
+    public int execute() throws IOException {
+        mRequest = mRequest.newBuilder()
                 .delete()
                 .build();
 
-        return super.executeRequest();
+        return super.execute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index a1a117ed..b24b9bce 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -34,20 +34,16 @@ import okhttp3.HttpUrl;
  */
 public class GetMethod extends HttpMethod {
 
-    public GetMethod(String httpUrl) {
-        super(httpUrl);
-    }
-
     public GetMethod(HttpUrl httpUrl) {
         super(httpUrl);
     }
 
     @Override
     public int execute() throws IOException {
-        mRequest.newBuilder()
+        mRequest = mRequest.newBuilder()
                 .get()
                 .build();
 
-        return super.executeRequest();
+        return super.execute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 0fbd3ab3..295e3199 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -24,12 +24,11 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
-import com.owncloud.android.lib.common.http.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
-import okhttp3.Request;
 
 /**
  * Wrapper to perform OkHttp calls
@@ -42,7 +41,8 @@ public abstract class HttpMethod extends HttpBaseMethod {
         super(httpUrl);
     }
 
-    public int executeRequest() throws IOException {
+    @Override
+    public int execute() throws IOException {
         mResponse = mOkHttpClient.newCall(mRequest).execute();
         return super.getStatusCode();
     }
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
index 34e2aa5b..f07b282d 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
@@ -24,6 +24,9 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
+import java.io.IOException;
+
+import okhttp3.HttpUrl;
 import okhttp3.RequestBody;
 
 /**
@@ -34,17 +37,17 @@ public class PostMethod extends HttpMethod {
 
     private RequestBody mRequestBody;
 
-    public PostMethod(String httpUrl, RequestBody requestBody){
+    public PostMethod(HttpUrl httpUrl, RequestBody requestBody){
         super(httpUrl);
         mRequestBody = requestBody;
     }
 
     @Override
-    public int execute() throws Exception {
-        mRequest.newBuilder()
+    public int execute() throws IOException {
+        mRequest = mRequest.newBuilder()
                 .post(mRequestBody)
                 .build();
 
-        return super.executeRequest();
+        return super.execute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
index 04d9abd8..7d1c10e2 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
@@ -24,23 +24,26 @@
 
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
+import java.io.IOException;
+
+import okhttp3.HttpUrl;
 import okhttp3.RequestBody;
 
 public class PutMethod extends HttpMethod{
 
     private RequestBody mRequestBody;
 
-    public PutMethod(String httpUrl, RequestBody requestBody){
+    public PutMethod(HttpUrl httpUrl, RequestBody requestBody){
         super(httpUrl);
         mRequestBody = requestBody;
     }
 
     @Override
-    public int execute() throws Exception {
-        mRequest.newBuilder()
+    public int execute() throws IOException {
+        mRequest = mRequest.newBuilder()
                 .put(mRequestBody)
                 .build();
 
-        return super.executeRequest();
+        return super.execute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index fcae6b64..dfa293a6 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -24,7 +24,7 @@
 
 package com.owncloud.android.lib.common.http.methods.webdav;
 
-import com.owncloud.android.lib.common.http.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
@@ -38,8 +38,8 @@ public abstract class DavMethod extends HttpBaseMethod {
 
     protected DavOCResource mDavResource;
 
-    public DavMethod(HttpUrl httpUrl) {
-        super();
+    protected DavMethod(HttpUrl httpUrl) {
+        super(httpUrl);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
                 httpUrl
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index 8323485b..279b8bc4 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -50,7 +50,7 @@ public class PutMethod extends DavMethod {
     };
 
     @Override
-    public int execute() throws IOException, HttpException, DavException {
+    public int execute() throws IOException, HttpException {
         try {
             mDavResource.put(
                     mRequestBody,
diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
index 883a50fb..eabd73e5 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -32,16 +32,12 @@ import java.util.Locale;
 
 import android.net.Uri;
 
-import com.owncloud.android.lib.common.http.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpMethod;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.xml.Namespace;
 
-import okhttp3.Response;
-
 public class WebdavUtils {
     public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat(
             "dd.MM.yyyy hh:mm");
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 82023ccd..6669fa8b 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -28,7 +28,7 @@ import android.accounts.Account;
 import android.accounts.AccountsException;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.lib.common.http.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 42bcd660..cc1555b2 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -72,79 +72,81 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 
         FileChannel channel = null;
         RandomAccessFile raf = null;
-        try {
-            File file = new File(mLocalPath);
-            raf = new RandomAccessFile(file, "r");
-            channel = raf.getChannel();
-            mEntity = new ChunkFromFileChannelRequestEntity(channel, mMimeType, CHUNK_SIZE, file);
-            synchronized (mDataTransferListeners) {
-                ((ProgressiveDataTransferer) mEntity)
-                    .addDatatransferProgressListeners(mDataTransferListeners);
-            }
 
-            long offset = 0;
-            String uriPrefix = client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath) +
-                "-chunking-" + Math.abs((new Random()).nextInt(9000) + 1000) + "-";
-            long totalLength = file.length();
-            long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-            String chunkSizeStr = String.valueOf(CHUNK_SIZE);
-            String totalLengthStr = String.valueOf(file.length());
-            for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
-                if (chunkIndex == chunkCount - 1) {
-                    chunkSizeStr = String.valueOf(CHUNK_SIZE * chunkCount - totalLength);
-                }
-                if (mPutMethod != null) {
-                    mPutMethod.releaseConnection();     // let the connection available
-                    // for other methods
-                }
-                mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex);
-                if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-                    mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
-                }
-                mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
-                mPutMethod.addRequestHeader(OC_CHUNK_SIZE_HEADER, chunkSizeStr);
-                mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
-
-                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-
-                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
-                mPutMethod.setRequestEntity(mEntity);
-                if (mCancellationRequested.get()) {
-                    mPutMethod.abort();
-                    // next method will throw an exception
-                }
-
-                if (chunkIndex == chunkCount - 1) {
-                    // Added a high timeout to the last chunk due to when the last chunk
-                    // arrives to the server with the last PUT, all chunks get assembled
-                    // within that PHP request, so last one takes longer.
-                    mPutMethod.getParams().setSoTimeout(LAST_CHUNK_TIMEOUT);
-                }
-
-                status = client.executeMethod(mPutMethod);
-
-                result = new RemoteOperationResult(
-                    isSuccess(status),
-                    mPutMethod
-                );
-
-                client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
-                Log_OC.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath +
-                    ", chunk index " + chunkIndex + ", count " + chunkCount +
-                    ", HTTP result status " + status);
-
-                if (!isSuccess(status))
-                    break;
-            }
-
-        } finally {
-            if (channel != null)
-                channel.close();
-            if (raf != null)
-                raf.close();
-            if (mPutMethod != null)
-                mPutMethod.releaseConnection();    // let the connection available for other methods
-        }
+        //TODO
+//        try {
+//            File file = new File(mLocalPath);
+//            raf = new RandomAccessFile(file, "r");
+//            channel = raf.getChannel();
+//            mEntity = new ChunkFromFileChannelRequestEntity(channel, mMimeType, CHUNK_SIZE, file);
+//            synchronized (mDataTransferListeners) {
+//                ((ProgressiveDataTransferer) mEntity)
+//                    .addDatatransferProgressListeners(mDataTransferListeners);
+//            }
+//
+//            long offset = 0;
+//            String uriPrefix = client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath) +
+//                "-chunking-" + Math.abs((new Random()).nextInt(9000) + 1000) + "-";
+//            long totalLength = file.length();
+//            long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
+//            String chunkSizeStr = String.valueOf(CHUNK_SIZE);
+//            String totalLengthStr = String.valueOf(file.length());
+//            for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
+//                if (chunkIndex == chunkCount - 1) {
+//                    chunkSizeStr = String.valueOf(CHUNK_SIZE * chunkCount - totalLength);
+//                }
+//                if (mPutMethod != null) {
+//                    mPutMethod.releaseConnection();     // let the connection available
+//                    // for other methods
+//                }
+//                mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex);
+//                if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
+//                    mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
+//                }
+//                mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
+//                mPutMethod.addRequestHeader(OC_CHUNK_SIZE_HEADER, chunkSizeStr);
+//                mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
+//
+//                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+//
+//                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
+//                mPutMethod.setRequestEntity(mEntity);
+//                if (mCancellationRequested.get()) {
+//                    mPutMethod.abort();
+//                    // next method will throw an exception
+//                }
+//
+//                if (chunkIndex == chunkCount - 1) {
+//                    // Added a high timeout to the last chunk due to when the last chunk
+//                    // arrives to the server with the last PUT, all chunks get assembled
+//                    // within that PHP request, so last one takes longer.
+//                    mPutMethod.getParams().setSoTimeout(LAST_CHUNK_TIMEOUT);
+//                }
+//
+//                status = client.executeMethod(mPutMethod);
+//
+//                result = new RemoteOperationResult(
+//                    isSuccess(status),
+//                    mPutMethod
+//                );
+//
+//                client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
+//                Log_OC.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath +
+//                    ", chunk index " + chunkIndex + ", count " + chunkCount +
+//                    ", HTTP result status " + status);
+//
+//                if (!isSuccess(status))
+//                    break;
+//            }
+//
+//        } finally {
+//            if (channel != null)
+//                channel.close();
+//            if (raf != null)
+//                raf.close();
+//            if (mPutMethod != null)
+//                mPutMethod.releaseConnection();    // let the connection available for other methods
+//        }
         return result;
     }
 
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 608b53db..899dd02d 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.network.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
@@ -134,11 +135,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         return result;
     }
 
-    public boolean isSuccess(int status) {
-        return ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED ||
-                status == HttpStatus.SC_NO_CONTENT));
-    }
-
     protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
         RemoteOperationResult result;
         try {
@@ -204,4 +200,9 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 //                mPutMethod.abort();
 //        }
     }
+
+    public boolean isSuccess(int status) {
+        return ((status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_CREATED ||
+                status == HttpConstants.HTTP_NO_CONTENT));
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 6e658374..02dd5626 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -231,7 +232,11 @@ public class CreateRemoteShareOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            PostMethod postMethod = new PostMethod(uriBuilder.build().toString(), formBody);
+            PostMethod postMethod = new PostMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString()),
+                    formBody
+            );
+
             postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index 87a8d975..ad61f5a9 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -30,6 +30,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -63,7 +64,11 @@ public class GetRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            GetMethod getMethod = new GetMethod(uriBuilder.build().toString());
+            GetMethod getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
+            );
+
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 4da1a810..97836665 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -32,6 +32,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -130,7 +131,10 @@ public class GetRemoteShareesOperation extends RemoteOperation{
             uriBuilder.appendQueryParameter(PARAM_PAGE, String.valueOf(mPage));
             uriBuilder.appendQueryParameter(PARAM_PER_PAGE, String.valueOf(mPerPage));
 
-            GetMethod getMethod = new GetMethod(uriBuilder.build().toString());
+            GetMethod getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
+            );
+
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 796991fa..7a64bb6b 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -29,6 +29,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -57,7 +58,10 @@ public class GetRemoteSharesOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            GetMethod getMethod = new GetMethod(uriBuilder.build().toString());
+            GetMethod getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(client.getBaseUri() + ShareUtils.SHARING_API_PATH)
+            );
+
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index 68510d37..aba0937d 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -72,7 +73,8 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(String.valueOf(mRemoteShareId));
 
-            DeleteMethod deleteMethod = new DeleteMethod(uriBuilder.build().toString());
+            DeleteMethod deleteMethod = new DeleteMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString()));
 
             deleteMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index a7074c9e..875df6de 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -29,6 +29,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -204,7 +205,11 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            PutMethod putMethod = new PutMethod(uriBuilder.build().toString(), formBody);
+            PutMethod putMethod = new PutMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString()),
+                    formBody
+            );
+
             putMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             putMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index e22663b2..fa389fd4 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -128,9 +129,10 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(OCS_ROUTE);    // avoid starting "/" in this method
             uriBuilder.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT);
 
-            String url = uriBuilder.build().toString();
+            GetMethod getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
+            );
 
-            GetMethod getMethod = new GetMethod(url);
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 8cea17b6..ce7e1c37 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -77,13 +78,13 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         boolean retval = false;
         String baseUrlSt = client.getBaseUri().toString();
         try {
-            String url = baseUrlSt + OwnCloudClient.STATUS_PATH;
-
             HttpClient.getOkHttpClient()
                     .newBuilder()
                     .followRedirects(false);
 
-            GetMethod getMethod = new GetMethod(url);
+            GetMethod getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(baseUrlSt + OwnCloudClient.STATUS_PATH)
+            );
 
             int status = client.executeHttpMethod(getMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 4097f1f9..f001c5d0 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -26,6 +26,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -86,7 +87,10 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
             ;
             Log_OC.d(TAG, "avatar URI: " + url);
 
-            getMethod = new GetMethod(url);
+            getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(url)
+            );
+
             int status = client.executeHttpMethod(getMethod);
 
             if (isSuccess(status)) {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index a5ee07da..1eeea6fd 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -24,14 +24,17 @@
 
 package com.owncloud.android.lib.resources.users;
 
-import java.util.ArrayList;
-import org.json.JSONObject;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
 
 import okhttp3.Request;
 
@@ -74,9 +77,10 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 
-            String url = client.getBaseUri() + OCS_ROUTE;
+            GetMethod getMethod = new GetMethod(
+                    HttpUtils.stringUrlToHttpUrl(client.getBaseUri() + OCS_ROUTE)
+            );
 
-            GetMethod getMethod = new GetMethod(url);
             int status = client.executeHttpMethod(getMethod);
 
             if (isSuccess(status)) {

From e4e8a5a5e37745f68394dfe4b8c249bbdf43729e Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 13 Jun 2018 14:03:41 +0200
Subject: [PATCH 055/133] Implement basic upload using the new wrapper

---
 .../lib/common/http/HttpConstants.java        | 14 ++++++++++
 .../common/http/methods/HttpBaseMethod.java   | 19 +++++++++++---
 .../http/methods/nonwebdav/PostMethod.java    |  5 +---
 .../http/methods/nonwebdav/PutMethod.java     |  5 +---
 .../common/http/methods/webdav/PutMethod.java | 21 +++++++--------
 .../files/UploadRemoteFileOperation.java      | 26 ++++++++++++-------
 .../shares/CreateRemoteShareOperation.java    |  7 +++--
 .../shares/UpdateRemoteShareOperation.java    |  5 ++--
 8 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index a8f7cfa9..a892d812 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -29,6 +29,20 @@ package com.owncloud.android.lib.common.http;
  */
 public class HttpConstants {
 
+    /***********************************************************************************************************
+     *************************************************** HEADERS ***********************************************
+     ***********************************************************************************************************/
+
+    public static final String IF_MATCH_HEADER = "If-Match";
+    public static final String IF_NONE_MATCH_HEADER = "If-None-Match";
+    public static final String CONTENT_TYPE_HEADER = "Content-Type";
+    public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
+    public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
+
+    /***********************************************************************************************************
+     ************************************************ STATUS CODES *********************************************
+     ***********************************************************************************************************/
+
     /**
      * 1xx Informational
      */
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 2886dcc3..f73103c0 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -33,6 +33,7 @@ import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 
 /**
@@ -46,6 +47,7 @@ public abstract class HttpBaseMethod {
     public abstract int execute() throws Exception;
     protected OkHttpClient mOkHttpClient;
     protected Request mRequest;
+    protected RequestBody mRequestBody;
     protected Response mResponse;
 
     protected HttpBaseMethod (HttpUrl httpUrl) {
@@ -56,19 +58,28 @@ public abstract class HttpBaseMethod {
     }
 
     // Request
+    public String getRequestHeader(String name) {
+        return mRequest.header(name);
+    }
+
     public Headers getRequestHeaders() {
         return mRequest.headers();
     }
 
     public void addRequestHeader(String name, String value) {
-        mRequest.newBuilder()
+        mRequest = mRequest.newBuilder()
                 .addHeader(name, value)
                 .build();
     }
 
-    public void setRequestHeader(String name, String value){
-        mRequest.newBuilder()
-                .header(name, value);
+    public void setRequestHeader(String name, String value) {
+        mRequest = mRequest.newBuilder()
+                .header(name, value)
+                .build();
+    }
+
+    public void setRequestBody(RequestBody requestBody) {
+        mRequestBody = requestBody;
     }
 
     // Response
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
index f07b282d..680400b6 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
@@ -35,11 +35,8 @@ import okhttp3.RequestBody;
  */
 public class PostMethod extends HttpMethod {
 
-    private RequestBody mRequestBody;
-
-    public PostMethod(HttpUrl httpUrl, RequestBody requestBody){
+    public PostMethod(HttpUrl httpUrl){
         super(httpUrl);
-        mRequestBody = requestBody;
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
index 7d1c10e2..64bf0f25 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
@@ -31,11 +31,8 @@ import okhttp3.RequestBody;
 
 public class PutMethod extends HttpMethod{
 
-    private RequestBody mRequestBody;
-
-    public PutMethod(HttpUrl httpUrl, RequestBody requestBody){
+    public PutMethod(HttpUrl httpUrl){
         super(httpUrl);
-        mRequestBody = requestBody;
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index 279b8bc4..f3667099 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -24,6 +24,8 @@
 
 package com.owncloud.android.lib.common.http.methods.webdav;
 
+import com.owncloud.android.lib.common.http.HttpConstants;
+
 import java.io.IOException;
 
 import at.bitfire.dav4android.exception.DavException;
@@ -38,13 +40,6 @@ import okhttp3.RequestBody;
  */
 public class PutMethod extends DavMethod {
 
-    private RequestBody mRequestBody;
-    private String mIfMatchETag;
-    private boolean mIfNoneMatch;
-    private String mContentType;
-    private String mOcTotalLength;
-    private String mOcXOcMtimeHeader;
-
     public PutMethod(HttpUrl httpUrl) {
         super(httpUrl);
     };
@@ -54,11 +49,13 @@ public class PutMethod extends DavMethod {
         try {
             mDavResource.put(
                     mRequestBody,
-                    mIfMatchETag,
-                    mIfNoneMatch,
-                    mContentType,
-                    mOcTotalLength,
-                    mOcXOcMtimeHeader
+                    super.getRequestHeader(HttpConstants.IF_MATCH_HEADER),
+                    // Save a file not known to exist, guaranteeing that another upload didn't happen
+                    // before, losing the data of the previous put
+                    true,
+                    super.getRequestHeader(HttpConstants.CONTENT_TYPE_HEADER),
+                    super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
+                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER)
             );
 
             mRequest = mDavResource.getRequest();
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 899dd02d..e4d2d5ed 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -47,6 +47,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -61,10 +64,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
     private static final String TAG = UploadRemoteFileOperation.class.getSimpleName();
 
-    protected static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
-    protected static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
-    protected static final String IF_MATCH_HEADER = "If-Match";
-
     protected String mLocalPath;
     protected String mRemotePath;
     protected String mMimeType;
@@ -107,7 +106,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 //            );
 
             mPutMethod = new PutMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)));
+                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
 
             if (mCancellationRequested.get()) {
                 // the operation was cancelled before getting it's turn to be executed in the queue of uploads
@@ -138,8 +137,8 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
         RemoteOperationResult result;
         try {
-            File f = new File(mLocalPath);
-
+            // Headers
+            File fileToUpload = new File(mLocalPath);
             // TODO
 //            synchronized (mDataTransferListeners) {
 //                ((ProgressiveDataTransferer)mEntity)
@@ -147,12 +146,19 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 //            }
 
             if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-                mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
+                mPutMethod.addRequestHeader(HttpConstants.IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
             }
 
-            mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(f.length()));
+            mPutMethod.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()));
 
-            mPutMethod.addRequestHeader(OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+            mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+
+            // Request body
+            MediaType mediaType = MediaType.parse(mMimeType);
+
+            mPutMethod.setRequestBody(
+                    RequestBody.create(mediaType, fileToUpload)
+            );
 
             int status = client.executeHttpMethod(mPutMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 02dd5626..b35dc885 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -226,17 +226,16 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 formBodyBuilder.add(PARAM_PERMISSIONS, Integer.toString(mPermissions));
             }
 
-            FormBody formBody = formBodyBuilder.build();
-
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
             PostMethod postMethod = new PostMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString()),
-                    formBody
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
             );
 
+            postMethod.setRequestBody(formBodyBuilder.build());
+
             postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 875df6de..df4996f2 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -206,10 +206,11 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
             PutMethod putMethod = new PutMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString()),
-                    formBody
+                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
             );
 
+            putMethod.setRequestBody(formBodyBuilder.build());
+
             putMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             putMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 

From b183e3f08ad4c9ff4e073aad1e3c3e6eb0ee9901 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 13 Jun 2018 14:14:15 +0200
Subject: [PATCH 056/133] add support for copy methode

---
 dav4android                                   |  2 +-
 .../http/methods/webdav/CopyMethod.java       | 30 +++++++
 .../files/CopyRemoteFileOperation.java        | 81 +++----------------
 3 files changed, 42 insertions(+), 71 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java

diff --git a/dav4android b/dav4android
index 466380e9..aec2f98c 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 466380e9bb8414d919391dbb14de7926dbfd387e
+Subproject commit aec2f98c69e4e86d148226c7ff00fe5dd2be49e4
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
new file mode 100644
index 00000000..9bcb9ce0
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
@@ -0,0 +1,30 @@
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import at.bitfire.dav4android.exception.UnauthorizedException;
+import okhttp3.HttpUrl;
+
+public class CopyMethod extends DavMethod {
+
+    final String destinationUrl;
+    final boolean forceOverride;
+
+    public CopyMethod(HttpUrl httpUrl, String destinationUrl, boolean forceOverride) {
+        super(httpUrl);
+        this.destinationUrl = destinationUrl;
+        this.forceOverride = forceOverride;
+    }
+
+    @Override
+    public int execute() throws Exception {
+        try {
+            mDavResource.copy(destinationUrl, forceOverride);
+
+            mRequest = mDavResource.getRequest();
+            mResponse = mDavResource.getResponse();
+
+        } catch (UnauthorizedException davException) {
+            // Do nothing, we will use the 401 code to handle the situation
+        }
+        return super.getStatusCode();
+    }
+}
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index 9359a23f..b9790810 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.resources.files;
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.methods.webdav.CopyMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -37,10 +38,11 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.MultiStatusResponse;
 import org.apache.jackrabbit.webdav.Status;
-import org.apache.jackrabbit.webdav.client.methods.CopyMethod;
 
 import java.io.IOException;
 
+import okhttp3.HttpUrl;
+
 
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
@@ -106,32 +108,26 @@ public class CopyRemoteFileOperation extends RemoteOperation {
         }
 
         /// perform remote operation
-        CopyMethod copyMethod = null;
         RemoteOperationResult result = null;
         try {
-            copyMethod = new CopyMethod(
-                    client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath),
+            CopyMethod copyMethod = new CopyMethod(
+                    HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                     client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
-                    mOverwrite
-            );
-            int status = client.executeMethod(copyMethod, COPY_READ_TIMEOUT, COPY_CONNECTION_TIMEOUT);
+                    mOverwrite);
+            final int status = client.executeHttpMethod(copyMethod);
 
-            /// process response
-            if (status == HttpStatus.SC_MULTI_STATUS) {
-                result = processPartialError(copyMethod);
-
-            } else if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
+            if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
-                client.exhaustResponse(copyMethod.getResponseBodyAsStream());
+                client.exhaustResponse(copyMethod.getResponseAsStream());
 
 
                 /// for other errors that could be explicitly handled, check first:
                 /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
 
             } else {
-                result = new RemoteOperationResult(isSuccess(status), copyMethod);
-                client.exhaustResponse(copyMethod.getResponseBodyAsStream());
+                result = new RemoteOperationResult(copyMethod);
+                client.exhaustResponse(copyMethod.getResponseAsStream());
             }
 
             Log.i(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
@@ -142,63 +138,8 @@ public class CopyRemoteFileOperation extends RemoteOperation {
             Log.e(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
                     result.getLogMessage(), e);
 
-        } finally {
-            if (copyMethod != null)
-                copyMethod.releaseConnection();
         }
 
         return result;
     }
-
-
-    /**
-     * Analyzes a multistatus response from the OC server to generate an appropriate result.
-     * <p/>
-     * In WebDAV, a COPY request on collections (folders) can be PARTIALLY successful: some
-     * children are copied, some other aren't.
-     * <p/>
-     * According to the WebDAV specification, a multistatus response SHOULD NOT include partial
-     * successes (201, 204) nor for descendants of already failed children (424) in the response
-     * entity. But SHOULD NOT != MUST NOT, so take carefully.
-     *
-     * @param copyMethod Copy operation just finished with a multistatus response
-     * @return A result for the {@link com.owncloud.android.lib.resources.files.CopyRemoteFileOperation} caller
-     * @throws java.io.IOException                       If the response body could not be parsed
-     * @throws org.apache.jackrabbit.webdav.DavException If the status code is other than MultiStatus or if obtaining
-     *                                                   the response XML document fails
-     */
-    private RemoteOperationResult processPartialError(CopyMethod copyMethod)
-            throws IOException, DavException {
-        // Adding a list of failed descendants to the result could be interesting; or maybe not.
-        // For the moment, let's take the easy way.
-
-        /// check that some error really occurred
-        MultiStatusResponse[] responses = copyMethod.getResponseBodyAsMultiStatus().getResponses();
-        Status[] status;
-        boolean failFound = false;
-        for (int i = 0; i < responses.length && !failFound; i++) {
-            status = responses[i].getStatus();
-            failFound = (
-                    status != null &&
-                            status.length > 0 &&
-                            status[0].getStatusCode() > 299
-            );
-        }
-
-        RemoteOperationResult result;
-        if (failFound) {
-            result = new RemoteOperationResult(ResultCode.PARTIAL_COPY_DONE);
-        } else {
-            result = new RemoteOperationResult(true, copyMethod);
-        }
-
-        return result;
-
-    }
-
-
-    protected boolean isSuccess(int status) {
-        return status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT;
-    }
-
 }

From 0387ceb1d426125e90107c66f35a74e26c3485b6 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 13 Jun 2018 17:21:38 +0200
Subject: [PATCH 057/133] Implement remove file operation

---
 .../files/RemoveRemoteFileOperation.java      | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 4e46fe97..3afb0761 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,15 +24,17 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
 /**
  * Remote operation performing the removal of a remote file or folder in the ownCloud server.
  *
@@ -42,10 +44,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
  */
 public class RemoveRemoteFileOperation extends RemoteOperation {
     private static final String TAG = RemoveRemoteFileOperation.class.getSimpleName();
-
-    private static final int REMOVE_READ_TIMEOUT = 30000;
-    private static final int REMOVE_CONNECTION_TIMEOUT = 5000;
-
     private String mRemotePath;
 
     /**
@@ -64,29 +62,30 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
      */
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        DeleteMethod delete = null;
+        RemoteOperationResult result;
 
         try {
-            delete = new DeleteMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
-            int status = client.executeMethod(delete, REMOVE_READ_TIMEOUT, REMOVE_CONNECTION_TIMEOUT);
-
-            delete.getResponseBodyAsString();   // exhaust the response, although not interesting
-            result = new RemoteOperationResult(
-                (delete.succeeded() || status == HttpStatus.SC_NOT_FOUND),
-                delete
+            DeleteMethod deleteMethod = new DeleteMethod(
+                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath))
             );
+
+            int status = client.executeHttpMethod(deleteMethod);
+
+            result = isSuccess(status) ?
+                    new RemoteOperationResult(OK) :
+                    new RemoteOperationResult(deleteMethod);
+
             Log_OC.i(TAG, "Remove " + mRemotePath + ": " + result.getLogMessage());
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Remove " + mRemotePath + ": " + result.getLogMessage(), e);
-
-        } finally {
-            if (delete != null)
-                delete.releaseConnection();
         }
 
         return result;
     }
+
+    private boolean isSuccess(int status) {
+        return status == HttpConstants.HTTP_OK || status == HttpConstants.HTTP_NO_CONTENT;
+    }
 }
\ No newline at end of file

From af5228a4251f541de6a46cc619017d3568c03fb0 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 14 Jun 2018 13:16:43 +0200
Subject: [PATCH 058/133] fix created snack bar showing up

---
 .../http/methods/webdav/MoveMethod.java       | 29 +++++++
 .../files/CopyRemoteFileOperation.java        | 11 ++-
 .../files/MoveRemoteFileOperation.java        | 80 ++++---------------
 .../files/RenameRemoteFileOperation.java      | 55 +++++--------
 4 files changed, 68 insertions(+), 107 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java

diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
new file mode 100644
index 00000000..45012af2
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
@@ -0,0 +1,29 @@
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import at.bitfire.dav4android.exception.UnauthorizedException;
+import okhttp3.HttpUrl;
+
+public class MoveMethod extends DavMethod {
+    final String destinationUrl;
+    final boolean forceOverride;
+
+    public MoveMethod(HttpUrl httpUrl, String destinationUrl, boolean forceOverride) {
+        super(httpUrl);
+        this.destinationUrl = destinationUrl;
+        this.forceOverride = forceOverride;
+    }
+
+    @Override
+    public int execute() throws Exception {
+        try {
+            mDavResource.move(destinationUrl, forceOverride);
+
+            mRequest = mDavResource.getRequest();
+            mResponse = mDavResource.getResponse();
+
+        } catch (UnauthorizedException davException) {
+            // Do nothing, we will use the 401 code to handle the situation
+        }
+        return super.getStatusCode();
+    }
+}
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index b9790810..dda3ea0e 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.resources.files;
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.CopyMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -35,11 +36,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavException;
-import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.Status;
-
-import java.io.IOException;
 
 import okhttp3.HttpUrl;
 
@@ -114,9 +110,12 @@ public class CopyRemoteFileOperation extends RemoteOperation {
                     HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                     client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
+            //TODO: apply timeout
             final int status = client.executeHttpMethod(copyMethod);
 
-            if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
+            if(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
+                result = new RemoteOperationResult(ResultCode.OK);
+            } else if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
                 client.exhaustResponse(copyMethod.getResponseAsStream());
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 2a344216..bc94a1d1 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -30,17 +30,20 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.MultiStatusResponse;
 import org.apache.jackrabbit.webdav.Status;
-import org.apache.jackrabbit.webdav.client.methods.MoveMethod;
 
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import okhttp3.HttpUrl;
+
 
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
@@ -109,32 +112,29 @@ public class MoveRemoteFileOperation extends RemoteOperation {
 
 
         /// perform remote operation
-        MoveMethod move = null;
         RemoteOperationResult result = null;
         try {
-            move = new MoveMethod(
-                client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath),
+            final MoveMethod move = new MoveMethod(
+                    HttpUrl.parse( client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                 client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
-                mOverwrite
-            );
-            int status = client.executeMethod(move, MOVE_READ_TIMEOUT, MOVE_CONNECTION_TIMEOUT);
-
+                    mOverwrite);
+            //int status = client.executeMethod(move, MOVE_READ_TIMEOUT, MOVE_CONNECTION_TIMEOUT);
+            final int status = client.executeHttpMethod(move);
             /// process response
-            if (status == HttpStatus.SC_MULTI_STATUS) {
-                result = processPartialError(move);
-
+            if(isSuccess(status)) {
+                result = new RemoteOperationResult(ResultCode.OK);
             } else if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
-                client.exhaustResponse(move.getResponseBodyAsStream());
+                client.exhaustResponse(move.getResponseAsStream());
 
 
                 /// for other errors that could be explicitly handled, check first:
                 /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
 
             } else {
-                result = new RemoteOperationResult(isSuccess(status), move);
-                client.exhaustResponse(move.getResponseBodyAsStream());
+                result = new RemoteOperationResult(move);
+                client.exhaustResponse(move.getResponseAsStream());
             }
 
             Log.i(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
@@ -145,63 +145,13 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             Log.e(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
                 result.getLogMessage(), e);
 
-        } finally {
-            if (move != null)
-                move.releaseConnection();
         }
 
         return result;
     }
 
-
-    /**
-     * Analyzes a multistatus response from the OC server to generate an appropriate result.
-     * <p>
-     * In WebDAV, a MOVE request on collections (folders) can be PARTIALLY successful: some
-     * children are moved, some other aren't.
-     * <p>
-     * According to the WebDAV specification, a multistatus response SHOULD NOT include partial
-     * successes (201, 204) nor for descendants of already failed children (424) in the response
-     * entity. But SHOULD NOT != MUST NOT, so take carefully.
-     *
-     * @param move Move operation just finished with a multistatus response
-     * @throws IOException  If the response body could not be parsed
-     * @throws DavException If the status code is other than MultiStatus or if obtaining
-     *                      the response XML document fails
-     * @return A result for the {@link MoveRemoteFileOperation} caller
-     */
-    private RemoteOperationResult processPartialError(MoveMethod move)
-        throws IOException, DavException {
-        // Adding a list of failed descendants to the result could be interesting; or maybe not.
-        // For the moment, let's take the easy way.
-
-        /// check that some error really occurred
-        MultiStatusResponse[] responses = move.getResponseBodyAsMultiStatus().getResponses();
-        Status[] status = null;
-        boolean failFound = false;
-        for (int i = 0; i < responses.length && !failFound; i++) {
-            status = responses[i].getStatus();
-            failFound = (
-                status != null &&
-                    status.length > 0 &&
-                    status[0].getStatusCode() > 299
-            );
-        }
-
-        RemoteOperationResult result;
-        if (failFound) {
-            result = new RemoteOperationResult(ResultCode.PARTIAL_MOVE_DONE);
-        } else {
-            result = new RemoteOperationResult(true, move);
-        }
-
-        return result;
-
-    }
-
-
     protected boolean isSuccess(int status) {
-        return status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT;
+        return status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT;
     }
 
 }
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 92ccae41..2731bc1c 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -24,13 +24,11 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import android.os.RemoteException;
-
 import java.io.File;
 
-import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -38,6 +36,11 @@ 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.commons.httpclient.HttpState;
+import org.apache.commons.httpclient.HttpStatus;
+
+import okhttp3.HttpUrl;
+
 
 /**
  * Remote operation performing the rename of a remote file or folder in the ownCloud server.
@@ -90,7 +93,7 @@ public class RenameRemoteFileOperation extends RemoteOperation {
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
 
-        LocalMoveMethod move = null;
+        MoveMethod move = null;
 
         OwnCloudVersion version = client.getOwnCloudVersion();
         boolean versionWithForbiddenChars =
@@ -107,15 +110,20 @@ public class RenameRemoteFileOperation extends RemoteOperation {
                     return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
                 }
 
-                move = new LocalMoveMethod(client.getWebdavUri() +
-                    WebdavUtils.encodePath(mOldRemotePath),
-                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath));
-                client.executeMethod(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
-                result = new RemoteOperationResult(move.succeeded(), move);
+                move = new MoveMethod(HttpUrl.parse(client.getWebdavUri() +
+                    WebdavUtils.encodePath(mOldRemotePath)),
+                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
+                //TODO: client.execute(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
+                final int status = client.executeHttpMethod(move);
+                if(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
+                    result = new RemoteOperationResult(ResultCode.OK);
+                } else {
+                    result = new RemoteOperationResult(move);
+                }
                 Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
                             result.getLogMessage()
                 );
-                client.exhaustResponse(move.getResponseBodyAsStream());
+                client.exhaustResponse(move.getResponseAsStream());
 
             } catch (Exception e) {
                 result = new RemoteOperationResult(e);
@@ -123,9 +131,6 @@ public class RenameRemoteFileOperation extends RemoteOperation {
                     ((mNewRemotePath == null) ? mNewName : mNewRemotePath) + ": " +
                     result.getLogMessage(), e);
 
-            } finally {
-                if (move != null)
-                    move.releaseConnection();
             }
 
         } else {
@@ -147,26 +152,4 @@ public class RenameRemoteFileOperation extends RemoteOperation {
         return exists.isSuccess();
     }
 
-    /**
-     * Move operation
-     */
-    private class LocalMoveMethod extends DavMethodBase {
-
-        public LocalMoveMethod(String uri, String dest) {
-            super(uri);
-            addRequestHeader(new org.apache.commons.httpclient.Header("Destination", dest));
-        }
-
-        @Override
-        public String getName() {
-            return "MOVE";
-        }
-
-        @Override
-        protected boolean isSuccess(int status) {
-            return status == 201 || status == 204;
-        }
-
-    }
-
 }

From 73b4ffe0b9c1a3ee7a99e186b8d72c957e03d35a Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 14 Jun 2018 13:26:39 +0200
Subject: [PATCH 059/133] remove furhter httpclinet constraints from move/copy
 operation

---
 .../files/CopyRemoteFileOperation.java        |  4 +-
 .../files/MoveRemoteFileOperation.java        |  9 +--
 .../files/RenameRemoteFileOperation.java      | 75 ++++++++-----------
 3 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index dda3ea0e..3d5b8fa2 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -35,8 +35,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-import org.apache.commons.httpclient.HttpStatus;
-
 import okhttp3.HttpUrl;
 
 
@@ -115,7 +113,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
 
             if(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
                 result = new RemoteOperationResult(ResultCode.OK);
-            } else if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
+            } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
                 client.exhaustResponse(copyMethod.getResponseAsStream());
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index bc94a1d1..14b6f772 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -24,13 +24,6 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.io.IOException;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavException;
-import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.Status;
-
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -123,7 +116,7 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             /// process response
             if(isSuccess(status)) {
                 result = new RemoteOperationResult(ResultCode.OK);
-            } else if (status == HttpStatus.SC_PRECONDITION_FAILED && !mOverwrite) {
+            } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
                 client.exhaustResponse(move.getResponseAsStream());
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 2731bc1c..517ae545 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -36,9 +36,6 @@ 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.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.HttpStatus;
-
 import okhttp3.HttpUrl;
 
 
@@ -91,53 +88,45 @@ public class RenameRemoteFileOperation extends RemoteOperation {
      */
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
 
-        MoveMethod move = null;
-
-        OwnCloudVersion version = client.getOwnCloudVersion();
-        boolean versionWithForbiddenChars =
+        final OwnCloudVersion version = client.getOwnCloudVersion();
+        final boolean versionWithForbiddenChars =
             (version != null && version.isVersionWithForbiddenCharacters());
-        boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath, versionWithForbiddenChars);
 
-        if (noInvalidChars) {
-            try {
-                if (mNewName.equals(mOldName)) {
-                    return new RemoteOperationResult(ResultCode.OK);
-                }
-
-                if (targetPathIsUsed(client)) {
-                    return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
-                }
-
-                move = new MoveMethod(HttpUrl.parse(client.getWebdavUri() +
-                    WebdavUtils.encodePath(mOldRemotePath)),
-                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
-                //TODO: client.execute(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
-                final int status = client.executeHttpMethod(move);
-                if(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
-                    result = new RemoteOperationResult(ResultCode.OK);
-                } else {
-                    result = new RemoteOperationResult(move);
-                }
-                Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
-                            result.getLogMessage()
-                );
-                client.exhaustResponse(move.getResponseAsStream());
-
-            } catch (Exception e) {
-                result = new RemoteOperationResult(e);
-                Log_OC.e(TAG, "Rename " + mOldRemotePath + " to " +
-                    ((mNewRemotePath == null) ? mNewName : mNewRemotePath) + ": " +
-                    result.getLogMessage(), e);
+        if(!FileUtils.isValidPath(mNewRemotePath, versionWithForbiddenChars))
+            return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
 
+        try {
+            if (mNewName.equals(mOldName)) {
+                return new RemoteOperationResult(ResultCode.OK);
             }
 
-        } else {
-            result = new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
-        }
+            if (targetPathIsUsed(client)) {
+                return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
+            }
 
-        return result;
+            final MoveMethod move = new MoveMethod(HttpUrl.parse(client.getWebdavUri() +
+                    WebdavUtils.encodePath(mOldRemotePath)),
+                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
+            //TODO: client.execute(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
+            final int status = client.executeHttpMethod(move);
+            final RemoteOperationResult result =
+                    (status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT)
+                            ? new RemoteOperationResult(ResultCode.OK)
+                            : new RemoteOperationResult(move);
+
+            Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
+                    result.getLogMessage()
+            );
+            client.exhaustResponse(move.getResponseAsStream());
+            return result;
+        } catch (Exception e) {
+            final RemoteOperationResult result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Rename " + mOldRemotePath + " to " +
+                    ((mNewRemotePath == null) ? mNewName : mNewRemotePath) + ": " +
+                    result.getLogMessage(), e);
+            return result;
+        }
     }
 
     /**

From 6a375dcb937720859e00026a2d19496e97fffb41 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 14 Jun 2018 13:30:19 +0200
Subject: [PATCH 060/133] Include timeouts and short refactoring

---
 .../android/lib/common/OwnCloudClient.java    | 10 ++++++++++
 .../lib/common/OwnCloudClientFactory.java     |  8 +++-----
 .../android/lib/common/http/HttpClient.java   |  1 +
 .../common/http/methods/HttpBaseMethod.java   | 19 +++++++++++++++++++
 .../files/CopyRemoteFileOperation.java        | 13 +++++++------
 .../files/ExistenceCheckRemoteOperation.java  |  7 +++++++
 .../files/ReadRemoteFolderOperation.java      |  2 ++
 .../status/GetRemoteStatusOperation.java      | 11 ++++++-----
 8 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 2cad64c6..dd01ddb4 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -96,6 +96,7 @@ public class OwnCloudClient extends HttpClient {
     private boolean mSilentRefreshOfAccountCredentials = true;
 
     private String mRedirectedLocation;
+    private boolean mFollowRedirects;
 
     /**
      * Constructor
@@ -282,6 +283,7 @@ public class OwnCloudClient extends HttpClient {
         int status;
 
         do {
+            method.setFollowRedirects(mFollowRedirects);
             status = method.execute();
             repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
             if (repeatWithFreshCredentials) {
@@ -668,4 +670,12 @@ public class OwnCloudClient extends HttpClient {
                 (mRedirectedLocation.toUpperCase().contains("SAML") ||
                         mRedirectedLocation.toLowerCase().contains("wayf")));
     }
+
+    public boolean isFollowRedirects() {
+        return mFollowRedirects;
+    }
+
+    public void setFollowRedirects(boolean followRedirects) {
+        this.mFollowRedirects = followRedirects;
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 89b45bce..6ba54983 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -161,8 +161,7 @@ public class OwnCloudClientFactory {
      * @param context   Android context where the OwnCloudClient is being created.
      * @return          A OwnCloudClient object ready to be used
      */
-    public static OwnCloudClient createOwnCloudClient(Uri uri, Context context,
-                                                      boolean followRedirects) {
+    public static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
         try {
             NetworkUtils.registerAdvancedSslContext(true, context);
         }  catch (GeneralSecurityException e) {
@@ -175,11 +174,10 @@ public class OwnCloudClientFactory {
         }
         
         OwnCloudClient client = new OwnCloudClient(uri, NetworkUtils.getMultiThreadedConnManager());
+
         client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
 
-        HttpClient.getOkHttpClient()
-                .newBuilder()
-                .followRedirects(followRedirects);
+        client.setFollowRedirects(followRedirects);
 
         client.setContext(context);
         
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 52bf9227..cfe9ba82 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -58,6 +58,7 @@ public class HttpClient {
                     .followRedirects(false)
                     .build();
         }
+
         return mOkHttpClient;
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index f73103c0..1f9524e0 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -28,6 +28,7 @@ import com.owncloud.android.lib.common.http.HttpClient;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
@@ -57,6 +58,24 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
+    public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .readTimeout(readTimeout, timeUnit)
+                .build();
+    }
+
+    public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .readTimeout(connectionTimeout, timeUnit)
+                .build();
+    }
+
+    public void setFollowRedirects(boolean followRedirects) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .followRedirects(followRedirects)
+                .build();
+    }
+
     // Request
     public String getRequestHeader(String name) {
         return mRequest.header(name);
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index 3d5b8fa2..6ee51d38 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -35,13 +35,14 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-import okhttp3.HttpUrl;
+import java.util.concurrent.TimeUnit;
 
+import okhttp3.HttpUrl;
 
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
  * in the same account.
- * <p/>
+ *
  * Allows renaming the moving file/folder at the same time.
  *
  * @author David A. Velasco
@@ -58,7 +59,6 @@ public class CopyRemoteFileOperation extends RemoteOperation {
 
     private boolean mOverwrite;
 
-
     /**
      * Constructor.
      * <p/>
@@ -74,7 +74,6 @@ public class CopyRemoteFileOperation extends RemoteOperation {
         mOverwrite = overwrite;
     }
 
-
     /**
      * Performs the rename operation.
      *
@@ -108,7 +107,10 @@ public class CopyRemoteFileOperation extends RemoteOperation {
                     HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                     client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
-            //TODO: apply timeout
+
+            copyMethod.setReadTimeout(COPY_READ_TIMEOUT, TimeUnit.SECONDS);
+            copyMethod.setConnectionTimeout(COPY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+
             final int status = client.executeHttpMethod(copyMethod);
 
             if(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
@@ -134,7 +136,6 @@ public class CopyRemoteFileOperation extends RemoteOperation {
             result = new RemoteOperationResult(e);
             Log.e(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
                     result.getLogMessage(), e);
-
         }
 
         return result;
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 5be03204..e9dbfd5a 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
@@ -35,6 +36,9 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.sql.Time;
+import java.util.concurrent.TimeUnit;
+
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -90,6 +94,9 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     0,
                     DavUtils.getAllPropset());
 
+            propfindMethod.setReadTimeout(TIMEOUT, TimeUnit.SECONDS);
+            propfindMethod.setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS);
+
             int status = client.executeHttpMethod(propfindMethod);
 
 //            if (previousFollowRedirects) {
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index feb910c8..09cfe23e 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -79,6 +79,8 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
                     DavConstants.DEPTH_1,
                     DavUtils.getAllPropset());
 
+            client.setFollowRedirects(true);
+
             int status = client.executeHttpMethod(propfindMethod);
 
             if (isSuccess(status)) {
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index ce7e1c37..abb76398 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -40,7 +40,9 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.sql.Time;
 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -58,7 +60,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
      * Maximum time to wait for a response from the server when the connection is being tested,
      * in MILLISECONDs.
      */
-    public static final int TRY_CONNECTION_TIMEOUT = 5000;
+    public static final long TRY_CONNECTION_TIMEOUT = 5000;
 
     private static final String TAG = GetRemoteStatusOperation.class.getSimpleName();
 
@@ -78,14 +80,13 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         boolean retval = false;
         String baseUrlSt = client.getBaseUri().toString();
         try {
-            HttpClient.getOkHttpClient()
-                    .newBuilder()
-                    .followRedirects(false);
-
             GetMethod getMethod = new GetMethod(
                     HttpUtils.stringUrlToHttpUrl(baseUrlSt + OwnCloudClient.STATUS_PATH)
             );
 
+            getMethod.setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+            getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+
             int status = client.executeHttpMethod(getMethod);
 
             mLatestResult = new RemoteOperationResult(OK);

From cb08fe32a4f20270d62812837d96fc3d7df1f231 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 14 Jun 2018 13:45:10 +0200
Subject: [PATCH 061/133] set timeout in move/localmove operation

---
 .../lib/resources/files/MoveRemoteFileOperation.java        | 6 ++++++
 .../lib/resources/files/RenameRemoteFileOperation.java      | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 14b6f772..80412b11 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -35,6 +35,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import java.util.concurrent.TimeUnit;
+
 import okhttp3.HttpUrl;
 
 
@@ -111,6 +113,10 @@ public class MoveRemoteFileOperation extends RemoteOperation {
                     HttpUrl.parse( client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                 client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
+
+            move.setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS);
+            move.setConnectionTimeout(MOVE_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+
             //int status = client.executeMethod(move, MOVE_READ_TIMEOUT, MOVE_CONNECTION_TIMEOUT);
             final int status = client.executeHttpMethod(move);
             /// process response
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 517ae545..d6599dd9 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
@@ -108,7 +109,10 @@ public class RenameRemoteFileOperation extends RemoteOperation {
             final MoveMethod move = new MoveMethod(HttpUrl.parse(client.getWebdavUri() +
                     WebdavUtils.encodePath(mOldRemotePath)),
                     client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
-            //TODO: client.execute(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);
+
+            move.setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
+            move.setConnectionTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
+
             final int status = client.executeHttpMethod(move);
             final RemoteOperationResult result =
                     (status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT)

From 019383378dd059616c197791f8fe3ad65ed31d8e Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 14 Jun 2018 14:11:01 +0200
Subject: [PATCH 062/133] add crete remote folder operation

---
 .../http/methods/webdav/MkColMethod.java      | 24 ++++++++++++++++
 .../files/CreateRemoteFolderOperation.java    | 28 ++++++++++++-------
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java

diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
new file mode 100644
index 00000000..ac8ebd06
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
@@ -0,0 +1,24 @@
+package com.owncloud.android.lib.common.http.methods.webdav;
+
+import at.bitfire.dav4android.exception.UnauthorizedException;
+import okhttp3.HttpUrl;
+
+public class MkColMethod extends DavMethod {
+    public MkColMethod(HttpUrl httpUrl) {
+        super(httpUrl);
+    }
+
+    @Override
+    public int execute() throws Exception {
+        try {
+            mDavResource.mkCol(null);
+
+            mRequest = mDavResource.getRequest();
+            mResponse = mDavResource.getResponse();
+
+        } catch (UnauthorizedException davException) {
+            // Do nothing, we will use the 401 code to handle the situation
+        }
+        return super.getStatusCode();
+    }
+}
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 5152710e..774d3a06 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -24,9 +24,10 @@
 
 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.http.HttpConstants;
+import com.owncloud.android.lib.common.http.methods.webdav.MkColMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -34,6 +35,10 @@ 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 java.util.concurrent.TimeUnit;
+
+import okhttp3.HttpUrl;
+
 
 /**
  * Remote operation performing the creation of a new folder in the ownCloud server.
@@ -95,23 +100,26 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
 
 
     private RemoteOperationResult createFolder(OwnCloudClient client) {
-        RemoteOperationResult result = null;
-        MkColMethod mkcol = null;
+        RemoteOperationResult result;
         try {
-            mkcol = new MkColMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
-            client.executeMethod(mkcol, READ_TIMEOUT, CONNECTION_TIMEOUT);
-            result = new RemoteOperationResult(mkcol.succeeded(), mkcol);
+            final MkColMethod mkcol = new MkColMethod(HttpUrl.parse(client.getWebdavUri()
+                    + WebdavUtils.encodePath(mRemotePath)));
+            mkcol.setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS);
+            mkcol.setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+            final int status = client.executeHttpMethod(mkcol);
+
+            result = (status == HttpConstants.HTTP_CREATED)
+                    ? new RemoteOperationResult(ResultCode.OK)
+                    : new RemoteOperationResult(mkcol);
             Log_OC.d(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage());
-            client.exhaustResponse(mkcol.getResponseBodyAsStream());
+            client.exhaustResponse(mkcol.getResponseAsStream());
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage(), e);
 
-        } finally {
-            if (mkcol != null)
-                mkcol.releaseConnection();
         }
+
         return result;
     }
 

From e78b96348b4f32bc1d0d77a978741592e363de2b Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 15 Jun 2018 09:43:16 +0200
Subject: [PATCH 063/133] fix crash when calling getOkHttpInterceptor

---
 .../android/lib/common/http/HttpClient.java     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index cfe9ba82..3bb47d1d 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -44,14 +44,7 @@ public class HttpClient {
 
     public static OkHttpClient getOkHttpClient() {
         if (mOkHttpClient == null) {
-
-            mOkHttpInterceptor = new HttpInterceptor()
-                    .addRequestInterceptor(new UserAgentInterceptor(
-                                    // TODO Try to get rid of this dependency
-                                    OwnCloudClientManagerFactory.getUserAgent()
-                            )
-                    );
-
+            
             mOkHttpClient = new OkHttpClient.Builder()
                     .addInterceptor(mOkHttpInterceptor)
                     .protocols(Arrays.asList(Protocol.HTTP_1_1))
@@ -63,6 +56,14 @@ public class HttpClient {
     }
 
     public static HttpInterceptor getOkHttpInterceptor() {
+        if(mOkHttpInterceptor == null) {
+            mOkHttpInterceptor = new HttpInterceptor()
+                    .addRequestInterceptor(new UserAgentInterceptor(
+                                    // TODO Try to get rid of this dependency
+                                    OwnCloudClientManagerFactory.getUserAgent()
+                            )
+                    );
+        }
         return mOkHttpInterceptor;
     }
 }
\ No newline at end of file

From 2041fb1962c2c5d6fca9da86551d40434ee34386 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 15 Jun 2018 10:05:21 +0200
Subject: [PATCH 064/133] add untestet protoype of new ReadRemoteFileOperation

---
 .../android/lib/common/http/HttpClient.java   |  2 +-
 .../files/ReadRemoteFileOperation.java        | 61 ++++++++++---------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 3bb47d1d..f0f81693 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -44,7 +44,7 @@ public class HttpClient {
 
     public static OkHttpClient getOkHttpClient() {
         if (mOkHttpClient == null) {
-            
+
             mOkHttpClient = new OkHttpClient.Builder()
                     .addInterceptor(mOkHttpInterceptor)
                     .protocols(Arrays.asList(Protocol.HTTP_1_1))
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index c710d0a2..3b2e2350 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -24,19 +24,23 @@
 package com.owncloud.android.lib.resources.files;
 
 import java.util.ArrayList;
-
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.jackrabbit.webdav.DavConstants;
-import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.network.WebdavEntry;
+import com.owncloud.android.lib.common.http.HttpConstants;
+import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import at.bitfire.dav4android.DavResource;
+import okhttp3.HttpUrl;
+
+import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
+
 
 /**
  * Remote operation performing the read a file from the ownCloud server.
@@ -70,38 +74,37 @@ public class ReadRemoteFileOperation extends RemoteOperation {
      */
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        PropFindMethod propfind = null;
+        PropfindMethod propfind = null;
         RemoteOperationResult result = null;
 
         /// take the duty of check the server for the current state of the file there
         try {
             // remote request
-            propfind = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
-                WebdavUtils.getFilePropSet(),    // PropFind Properties
-                DavConstants.DEPTH_0);
-            int status;
-            status = client.executeMethod(propfind, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
+            propfind = new PropfindMethod(
+                    HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    DEPTH_0,
+                    DavUtils.getAllPropset());
 
-            boolean isSuccess = (
-                status == HttpStatus.SC_MULTI_STATUS ||
-                    status == HttpStatus.SC_OK
-            );
-            if (isSuccess) {
+            propfind.setReadTimeout(SYNC_READ_TIMEOUT, TimeUnit.SECONDS);
+            propfind.setConnectionTimeout(SYNC_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+            final int status = client.executeHttpMethod(propfind);
+
+            if (status == HttpConstants.HTTP_MULTI_STATUS
+                    || status == HttpConstants.HTTP_OK) {
                 // Parse response
-                MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
-                WebdavEntry we = new WebdavEntry(resp.getResponses()[0],
-                    client.getWebdavUri().getPath());
-                RemoteFile remoteFile = new RemoteFile(we);
-                ArrayList<Object> files = new ArrayList<Object>();
-                files.add(remoteFile);
+                final DavResource resource = propfind.getMembers().iterator().next();
 
-                // Result of the operation
-                result = new RemoteOperationResult(true, propfind);
+                final RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
+
+                ArrayList<Object> files = new ArrayList<>();
+                files.add(file);
+
+                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK);
                 result.setData(files);
 
             } else {
-                result = new RemoteOperationResult(false, propfind);
-                client.exhaustResponse(propfind.getResponseBodyAsStream());
+                result = new RemoteOperationResult(propfind);
+                client.exhaustResponse(propfind.getResponseAsStream());
             }
 
         } catch (Exception e) {
@@ -109,10 +112,8 @@ public class ReadRemoteFileOperation extends RemoteOperation {
             e.printStackTrace();
             Log_OC.e(TAG, "Synchronizing  file " + mRemotePath + ": " + result.getLogMessage(),
                 result.getException());
-        } finally {
-            if (propfind != null)
-                propfind.releaseConnection();
         }
+
         return result;
     }
 

From ff17ab68377ea71a91b9708fd2c1701a27b378d2 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 15 Jun 2018 10:06:51 +0200
Subject: [PATCH 065/133] Working on having the upload progress

---
 .../lib/common/OwnCloudClientManager.java     |  6 +--
 .../android/lib/common/http/HttpClient.java   | 20 ++++----
 .../lib/common/network/FileRequestBody.java   | 48 +++++++++++++++++++
 .../files/MoveRemoteFileOperation.java        |  1 -
 .../files/UploadRemoteFileOperation.java      |  3 +-
 .../users/GetRemoteUserAvatarOperation.java   |  1 -
 6 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/network/FileRequestBody.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
index 856a11ba..e7fe77af 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
@@ -42,13 +42,13 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce
 
 public interface OwnCloudClientManager {
 
-	public OwnCloudClient getClientFor(OwnCloudAccount account, Context context)
+	OwnCloudClient getClientFor(OwnCloudAccount account, Context context)
             throws AccountNotFoundException, OperationCanceledException, AuthenticatorException,
             IOException;
     
-    public OwnCloudClient removeClientFor(OwnCloudAccount account);
+    OwnCloudClient removeClientFor(OwnCloudAccount account);
 
-    public void saveAllClients(Context context, String accountType)
+    void saveAllClients(Context context, String accountType)
 			throws AccountNotFoundException, AuthenticatorException, 
 			IOException, OperationCanceledException;
     
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index f0f81693..3dfc8f7b 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -39,31 +39,29 @@ import okhttp3.Protocol;
  */
 public class HttpClient {
 
-    private static OkHttpClient mOkHttpClient;
-    private static HttpInterceptor mOkHttpInterceptor;
+    private static OkHttpClient sOkHttpClient;
+    private static HttpInterceptor sOkHttpInterceptor;
 
     public static OkHttpClient getOkHttpClient() {
-        if (mOkHttpClient == null) {
-
-            mOkHttpClient = new OkHttpClient.Builder()
-                    .addInterceptor(mOkHttpInterceptor)
+        if (sOkHttpClient == null) {
+            sOkHttpClient = new OkHttpClient.Builder()
+                    .addInterceptor(getOkHttpInterceptor())
                     .protocols(Arrays.asList(Protocol.HTTP_1_1))
                     .followRedirects(false)
                     .build();
         }
-
-        return mOkHttpClient;
+        return sOkHttpClient;
     }
 
     public static HttpInterceptor getOkHttpInterceptor() {
-        if(mOkHttpInterceptor == null) {
-            mOkHttpInterceptor = new HttpInterceptor()
+        if (sOkHttpInterceptor == null) {
+            sOkHttpInterceptor = new HttpInterceptor()
                     .addRequestInterceptor(new UserAgentInterceptor(
                                     // TODO Try to get rid of this dependency
                                     OwnCloudClientManagerFactory.getUserAgent()
                             )
                     );
         }
-        return mOkHttpInterceptor;
+        return sOkHttpInterceptor;
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
new file mode 100644
index 00000000..d8e65acc
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
@@ -0,0 +1,48 @@
+package com.owncloud.android.lib.common.network;
+
+import android.util.Log;
+
+import java.io.File;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.Okio;
+import okio.Source;
+
+import static android.content.ContentValues.TAG;
+
+public class FileRequestBody extends RequestBody {
+
+    MediaType mContentType;
+    File mFile;
+
+    FileRequestBody(MediaType contentType, File file) {
+        mContentType = contentType;
+        mFile = file;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return mContentType;
+    }
+
+    @Override
+    public void writeTo(BufferedSink sink) {
+        Source source;
+        try {
+            source = Okio.source(mFile);
+            //sink.writeAll(source);
+            Buffer buffer = new Buffer();
+            Long remaining = contentLength();
+
+            for (long readCount; (readCount = source.read(buffer, 2048)) != -1;) {
+                sink.write(buffer, readCount);
+                Log.d(TAG, "source size: " + contentLength() + " remaining bytes: " + (remaining -= readCount));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 80412b11..26cdee54 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -105,7 +105,6 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             return new RemoteOperationResult(ResultCode.INVALID_MOVE_INTO_DESCENDANT);
         }
 
-
         /// perform remote operation
         RemoteOperationResult result = null;
         try {
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index e4d2d5ed..72855cc0 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.resources.files;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.network.FileRequestBody;
 import com.owncloud.android.lib.common.network.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
@@ -157,7 +158,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
             MediaType mediaType = MediaType.parse(mMimeType);
 
             mPutMethod.setRequestBody(
-                    RequestBody.create(mediaType, fileToUpload)
+                    FileRequestBody.create(mediaType, fileToUpload)
             );
 
             int status = client.executeHttpMethod(mPutMethod);
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index f001c5d0..2231ac14 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -175,7 +175,6 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 } catch (IOException o) {
                     Log_OC.e(TAG, "Unexpected exception closing output stream ", o);
                 }
-                client.exhaustResponse(getMethod.getResponseAsStream());
             }
         }
 

From 82fce2944baf6529aeaaa2930077f268f00dc9fa Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 15 Jun 2018 11:18:31 +0200
Subject: [PATCH 066/133] Fix read remote file operation

---
 .../files/ReadRemoteFileOperation.java        | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 3b2e2350..31ca2055 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -23,10 +23,6 @@
  */
 package com.owncloud.android.lib.resources.files;
 
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
@@ -36,11 +32,14 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
 import at.bitfire.dav4android.DavResource;
 import okhttp3.HttpUrl;
 
 import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
-
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
  * Remote operation performing the read a file from the ownCloud server.
@@ -57,7 +56,6 @@ public class ReadRemoteFileOperation extends RemoteOperation {
 
     private String mRemotePath;
 
-
     /**
      * Constructor
      *
@@ -74,8 +72,8 @@ public class ReadRemoteFileOperation extends RemoteOperation {
      */
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        PropfindMethod propfind = null;
-        RemoteOperationResult result = null;
+        PropfindMethod propfind;
+        RemoteOperationResult result;
 
         /// take the duty of check the server for the current state of the file there
         try {
@@ -92,14 +90,14 @@ public class ReadRemoteFileOperation extends RemoteOperation {
             if (status == HttpConstants.HTTP_MULTI_STATUS
                     || status == HttpConstants.HTTP_OK) {
                 // Parse response
-                final DavResource resource = propfind.getMembers().iterator().next();
+                final DavResource resource = propfind.getDavResource();
 
                 final RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
 
                 ArrayList<Object> files = new ArrayList<>();
                 files.add(file);
 
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK);
+                result = new RemoteOperationResult(OK);
                 result.setData(files);
 
             } else {
@@ -116,5 +114,4 @@ public class ReadRemoteFileOperation extends RemoteOperation {
 
         return result;
     }
-
-}
+}
\ No newline at end of file

From 60c1be2c0cc37e7062e51688fbc303c91a9437c5 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 15 Jun 2018 12:29:59 +0200
Subject: [PATCH 067/133] add DownloadRemoteFileOperation

---
 .../http/methods/nonwebdav/GetMethod.java     |  1 +
 .../http/methods/nonwebdav/HttpMethod.java    | 10 +++-
 .../files/DownloadRemoteFileOperation.java    | 49 +++++++++++--------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index b24b9bce..65a49f94 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -46,4 +46,5 @@ public class GetMethod extends HttpMethod {
 
         return super.execute();
     }
+
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 295e3199..804d39f5 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -28,6 +28,7 @@ import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import java.io.IOException;
 
+import okhttp3.Call;
 import okhttp3.HttpUrl;
 
 /**
@@ -37,13 +38,20 @@ import okhttp3.HttpUrl;
  */
 public abstract class HttpMethod extends HttpBaseMethod {
 
+    private Call mCall;
+
     public HttpMethod(HttpUrl httpUrl) {
         super(httpUrl);
     }
 
     @Override
     public int execute() throws IOException {
-        mResponse = mOkHttpClient.newCall(mRequest).execute();
+        mCall = mOkHttpClient.newCall(mRequest);
+        mResponse = mCall.execute();
         return super.getStatusCode();
     }
+
+    public void abort() {
+        mCall.cancel();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index a18672de..9cd65b52 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -34,11 +34,10 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
@@ -46,6 +45,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import okhttp3.HttpUrl;
+
 /**
  * Remote operation performing the download of a remote file in the ownCloud server.
  *
@@ -103,30 +104,32 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult result;
         int status;
         boolean savedFile = false;
-        mGet = new GetMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
+        mGet = new GetMethod(HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)));
         Iterator<OnDatatransferProgressListener> it;
 
         FileOutputStream fos = null;
         BufferedInputStream bis = null;
         try {
-            status = client.executeMethod(mGet);
+            status = client.executeHttpMethod(mGet);
             if (isSuccess(status)) {
                 targetFile.createNewFile();
-                bis = new BufferedInputStream(mGet.getResponseBodyAsStream());
+                bis = new BufferedInputStream(mGet.getResponseAsStream());
                 fos = new FileOutputStream(targetFile);
                 long transferred = 0;
 
-                Header contentLength = mGet.getResponseHeader("Content-Length");
-                long totalToTransfer = (contentLength != null &&
-                    contentLength.getValue().length() > 0) ?
-                    Long.parseLong(contentLength.getValue()) : 0;
+                String contentLength = mGet.getResponseHeader("Content-Length");
+                long totalToTransfer =
+                        (contentLength != null
+                                && contentLength.length() > 0)
+                        ? Long.parseLong(contentLength)
+                        : 0;
 
                 byte[] bytes = new byte[4096];
                 int readResult;
                 while ((readResult = bis.read(bytes)) != -1) {
                     synchronized (mCancellationRequested) {
                         if (mCancellationRequested.get()) {
-                            mGet.abort();
+                             mGet.abort();
                             throw new OperationCancelledException();
                         }
                     }
@@ -142,41 +145,45 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                 }
                 if (transferred == totalToTransfer) {  // Check if the file is completed
                     savedFile = true;
-                    Header modificationTime = mGet.getResponseHeader("Last-Modified");
-                    if (modificationTime == null) {
-                        modificationTime = mGet.getResponseHeader("last-modified");
-                    }
+                    final String modificationTime =
+                            mGet.getResponseHeaders().get("Last-Modified") != null
+                            ? mGet.getResponseHeaders().get("Last-Modified")
+                            :  mGet.getResponseHeader("last-modified");
+
                     if (modificationTime != null) {
-                        Date d = WebdavUtils.parseResponseDate(modificationTime.getValue());
+                        final Date d = WebdavUtils.parseResponseDate(modificationTime);
                         mModificationTimestamp = (d != null) ? d.getTime() : 0;
                     } else {
                         Log_OC.e(TAG, "Could not read modification time from response downloading " + mRemotePath);
                     }
-                    // TODO
-//                    mEtag = WebdavUtils.getEtagFromResponse(mGet);
+
+                    // TODO mEtag = WebdavUtils.getEtagFromResponse(mGet);
                     if (mEtag.length() == 0) {
                         Log_OC.e(TAG, "Could not read eTag from response downloading " + mRemotePath);
                     }
 
                 } else {
-                    client.exhaustResponse(mGet.getResponseBodyAsStream());
+                    client.exhaustResponse(mGet.getResponseAsStream());
                     // TODO some kind of error control!
                 }
 
             } else if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
-                client.exhaustResponse(mGet.getResponseBodyAsStream());
+                client.exhaustResponse(mGet.getResponseAsStream());
 
             } // else, body read by RemoteOperationResult constructor
 
-            result = new RemoteOperationResult(isSuccess(status), mGet);
+            result = isSuccess(status)
+                    ? new RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
+                    : new RemoteOperationResult(mGet);
 
+        } catch (Exception e) {
+            return new RemoteOperationResult(e);
         } finally {
             if (fos != null) fos.close();
             if (bis != null) bis.close();
             if (!savedFile && targetFile.exists()) {
                 targetFile.delete();
             }
-            mGet.releaseConnection();    // let the connection available for other methods
         }
         return result;
     }

From 9caa79becc49206dbe4d0d83add8014e50ce3f97 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 15 Jun 2018 12:52:06 +0200
Subject: [PATCH 068/133] remove ApacheHttp imports from downloadoperation

---
 .../lib/resources/files/DownloadRemoteFileOperation.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 9cd65b52..13a387c7 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -34,9 +34,8 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.httpclient.HttpStatus;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -189,7 +188,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
 
     private String getTmpPath() {

From b1f2c0cbef783ed721eb673c5239a90997c10669 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 15 Jun 2018 13:59:06 +0200
Subject: [PATCH 069/133] Implement upload progress

---
 .../lib/common/network/FileRequestBody.java   | 89 +++++++++++++++----
 .../lib/common/network/FileRequestEntity.java | 11 +--
 .../OnDatatransferProgressListener.java       |  4 +-
 .../network/ProgressiveDataTransferer.java    |  1 -
 .../files/UploadRemoteFileOperation.java      | 46 +++++-----
 5 files changed, 99 insertions(+), 52 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
index d8e65acc..cd938562 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestBody.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
@@ -1,26 +1,55 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.network;
 
-import android.util.Log;
-
 import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
-import okio.Buffer;
 import okio.BufferedSink;
 import okio.Okio;
 import okio.Source;
 
-import static android.content.ContentValues.TAG;
+/**
+ * A Request body that represents a file and include information about the progress when uploading it
+ *
+ * @author David González Verdugo
+ */
+public class FileRequestBody extends RequestBody implements ProgressiveDataTransferer {
 
-public class FileRequestBody extends RequestBody {
+    private File mFile;
+    private MediaType mContentType;
+    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
 
-    MediaType mContentType;
-    File mFile;
-
-    FileRequestBody(MediaType contentType, File file) {
-        mContentType = contentType;
+    public FileRequestBody(File file, MediaType contentType) {
         mFile = file;
+        mContentType = contentType;
     }
 
     @Override
@@ -31,18 +60,46 @@ public class FileRequestBody extends RequestBody {
     @Override
     public void writeTo(BufferedSink sink) {
         Source source;
+        Iterator<OnDatatransferProgressListener> it;
         try {
             source = Okio.source(mFile);
-            //sink.writeAll(source);
-            Buffer buffer = new Buffer();
-            Long remaining = contentLength();
+            long transferred = 0;
+            long read;
 
-            for (long readCount; (readCount = source.read(buffer, 2048)) != -1;) {
-                sink.write(buffer, readCount);
-                Log.d(TAG, "source size: " + contentLength() + " remaining bytes: " + (remaining -= readCount));
+            while ((read = source.read(sink.buffer(), 2048)) != -1) {
+                transferred += read;
+                sink.flush();
+                synchronized (mDataTransferListeners) {
+                    it = mDataTransferListeners.iterator();
+                    while (it.hasNext()) {
+                        it.next().onTransferProgress(read, transferred, mFile.length(), mFile.getAbsolutePath());
+                    }
+                }
             }
+
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
+        synchronized (mDataTransferListeners) {
+            mDataTransferListeners.add(listener);
+        }
+    }
+
+    @Override
+    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
+        synchronized (mDataTransferListeners) {
+            mDataTransferListeners.addAll(listeners);
+        }
+    }
+
+    @Override
+    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
+        synchronized (mDataTransferListeners) {
+            mDataTransferListeners.remove(listener);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
index a7d6fd0e..3548dd5e 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
@@ -25,6 +25,8 @@
 
 package com.owncloud.android.lib.common.network;
 
+import org.apache.commons.httpclient.methods.RequestEntity;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -37,10 +39,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.httpclient.methods.RequestEntity;
-
-import com.owncloud.android.lib.common.utils.Log_OC;
-
 
 
 /**
@@ -51,7 +49,7 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
 
     final File mFile;
     final String mContentType;
-    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
+    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
 
     public FileRequestEntity(final File file, final String contentType) {
         super();
@@ -162,5 +160,4 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
             return mWrapped;
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java b/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
index a36694cf..e78320cd 100644
--- a/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
+++ b/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
@@ -26,5 +26,5 @@
 package com.owncloud.android.lib.common.network;
 
 public interface OnDatatransferProgressListener {
-    public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileAbsoluteName);
-}
+    void onTransferProgress(long read, long transferred, long percent, String absolutePath);
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java b/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
index 2868ac8c..979e8082 100644
--- a/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
+++ b/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
@@ -27,7 +27,6 @@ package com.owncloud.android.lib.common.network;
 import java.util.Collection;
 
 
-
 public interface ProgressiveDataTransferer {
 
     public void addDatatransferProgressListener (OnDatatransferProgressListener listener);
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 72855cc0..635fbd17 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -27,20 +27,13 @@ package com.owncloud.android.lib.resources.files;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
 import com.owncloud.android.lib.common.network.FileRequestBody;
-import com.owncloud.android.lib.common.network.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
-
-import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.params.HttpMethodParams;
 
 import java.io.File;
 import java.io.IOException;
@@ -49,6 +42,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import okhttp3.MediaType;
+import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -75,7 +69,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     protected final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
     protected Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
 
-    protected RequestEntity mEntity = null;
+    protected FileRequestBody mFileRequestBody = null;
 
     public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType,
                                      String fileLastModifTimestamp) {
@@ -138,13 +132,15 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
         RemoteOperationResult result;
         try {
-            // Headers
             File fileToUpload = new File(mLocalPath);
-            // TODO
-//            synchronized (mDataTransferListeners) {
-//                ((ProgressiveDataTransferer)mEntity)
-//                        .addDatatransferProgressListeners(mDataTransferListeners);
-//            }
+
+            MediaType mediaType = MediaType.parse(mMimeType);
+
+            mFileRequestBody = new FileRequestBody(fileToUpload, mediaType);
+
+            synchronized (mDataTransferListeners) {
+                mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
+            }
 
             if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
                 mPutMethod.addRequestHeader(HttpConstants.IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
@@ -154,12 +150,12 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
             mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
 
-            // Request body
-            MediaType mediaType = MediaType.parse(mMimeType);
+            RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addPart(mFileRequestBody)
+                    .build();
 
-            mPutMethod.setRequestBody(
-                    FileRequestBody.create(mediaType, fileToUpload)
-            );
+            mPutMethod.setRequestBody(requestBody);
 
             int status = client.executeHttpMethod(mPutMethod);
 
@@ -170,8 +166,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
                 result = new RemoteOperationResult(mPutMethod);
             }
 
-            client.exhaustResponse(mPutMethod.getResponseAsStream());
-
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
         }
@@ -186,8 +180,8 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         synchronized (mDataTransferListeners) {
             mDataTransferListeners.add(listener);
         }
-        if (mEntity != null) {
-            ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListener(listener);
+        if (mFileRequestBody != null) {
+            mFileRequestBody.addDatatransferProgressListener(listener);
         }
     }
     
@@ -195,8 +189,8 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         synchronized (mDataTransferListeners) {
             mDataTransferListeners.remove(listener);
         }
-        if (mEntity != null) {
-            ((ProgressiveDataTransferer)mEntity).removeDatatransferProgressListener(listener);
+        if (mFileRequestBody != null) {
+            mFileRequestBody.removeDatatransferProgressListener(listener);
         }
     }
     

From 8540eed348855a74b8a156affbada0b3bd258fae Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Mon, 18 Jun 2018 11:02:43 +0200
Subject: [PATCH 070/133] add oauth operations

---
 .../oauth/OAuth2GetAccessTokenOperation.java  | 53 +++++------
 .../OAuth2RefreshAccessTokenOperation.java    | 87 +++++++++----------
 2 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
index 33b3c8b5..d84d9f44 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
@@ -31,19 +31,20 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudBasicCredentials;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
 
+import okhttp3.HttpUrl;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
 
 public class OAuth2GetAccessTokenOperation extends RemoteOperation {
     
@@ -83,28 +84,34 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
-        PostMethod postMethod = null;
         
         try {
-            NameValuePair[] nameValuePairs = new NameValuePair[4];
-            nameValuePairs[0] = new NameValuePair(OAuth2Constants.KEY_GRANT_TYPE, mGrantType);
-            nameValuePairs[1] = new NameValuePair(OAuth2Constants.KEY_CODE, mCode);
-            nameValuePairs[2] = new NameValuePair(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri);
-            nameValuePairs[3] = new NameValuePair(OAuth2Constants.KEY_CLIENT_ID, mClientId);
+
+            final RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE, mGrantType)
+                    .addFormDataPart(OAuth2Constants.KEY_CODE, mCode)
+                    .addFormDataPart(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri)
+                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
+                    .build();
 
             Uri.Builder uriBuilder = client.getBaseUri().buildUpon();
             uriBuilder.appendEncodedPath(mAccessTokenEndpointPath);
 
-            postMethod = new PostMethod(uriBuilder.build().toString());
-            postMethod.setRequestBody(nameValuePairs);
+            final PostMethod postMethod = new PostMethod(HttpUrl.parse(
+                    client.getBaseUri().buildUpon()
+                            .appendEncodedPath(mAccessTokenEndpointPath)
+                            .build()
+                            .toString()));
 
-            OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(
-                mClientId,
-                mClientSecret
-            );
+            postMethod.setRequestBody(requestBody);
+
+
+            // Do the B***S*** Switch and execute
+            OwnCloudCredentials oauthCredentials =
+                    new OwnCloudBasicCredentials(mClientId, mClientSecret);
             OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
-
-            client.executeMethod(postMethod);
+            client.executeHttpMethod(postMethod);
             switchClientCredentials(oldCredentials);
 
             String response = postMethod.getResponseBodyAsString();
@@ -117,25 +124,21 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
                     result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);
 
                 } else {
-                    result = new RemoteOperationResult(true, postMethod);
+                    result = new RemoteOperationResult(ResultCode.OK);
                     ArrayList<Object> data = new ArrayList<>();
                     data.add(accessTokenResult);
                     result.setData(data);
                 }
 
             } else {
-                result = new RemoteOperationResult(false, postMethod);
-                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+                result = new RemoteOperationResult(ResultCode.OK);
+                client.exhaustResponse(postMethod.getResponseAsStream());
             }
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             
-        } finally {
-            if (postMethod != null)
-                postMethod.releaseConnection();    // let the connection available for other methods
         }
-        
         return result;
     }
 
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
index cbdb48b1..d8cb3a50 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
@@ -31,13 +31,17 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.PostMethod;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Map;
 
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
+
+import okhttp3.HttpUrl;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
 public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
 
     private static final String TAG = OAuth2RefreshAccessTokenOperation.class.getSimpleName();
@@ -73,68 +77,59 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
-        RemoteOperationResult result = null;
-        PostMethod postMethod = null;
-
         try {
-            NameValuePair[] nameValuePairs = new NameValuePair[3];
-            nameValuePairs[0] = new NameValuePair(
-                OAuth2Constants.KEY_GRANT_TYPE,
-                OAuth2GrantType.REFRESH_TOKEN.getValue()    // always for this operation
-            );
-            nameValuePairs[1] = new NameValuePair(OAuth2Constants.KEY_CLIENT_ID, mClientId);
-            nameValuePairs[2] = new NameValuePair(OAuth2Constants.KEY_REFRESH_TOKEN, mRefreshToken);
+
+            final RequestBody requestBody = new MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE,
+                            OAuth2GrantType.REFRESH_TOKEN.getValue())
+                    .addFormDataPart(OAuth2Constants.KEY_CLIENT_ID, mClientId)
+                    .addFormDataPart(OAuth2Constants.KEY_REFRESH_TOKEN, mRefreshToken)
+                    .build();
 
             Uri.Builder uriBuilder = client.getBaseUri().buildUpon();
             uriBuilder.appendEncodedPath(mAccessTokenEndpointPath);
 
-            postMethod = new PostMethod(uriBuilder.build().toString());
-            postMethod.setRequestBody(nameValuePairs);
+            final PostMethod postMethod = new PostMethod(HttpUrl.parse(
+                    client.getBaseUri().buildUpon()
+                            .appendEncodedPath(mAccessTokenEndpointPath)
+                            .build()
+                            .toString()));
+            postMethod.setRequestBody(requestBody);
 
-            OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(
-                    mClientId,
-                    mClientSecret
-            );
 
-            OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
-
-            client.executeMethod(postMethod);
+            final OwnCloudCredentials oauthCredentials =
+                    new OwnCloudBasicCredentials(mClientId, mClientSecret);
 
+            // Do the B***S*** switch
+            final OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
+            client.executeHttpMethod(postMethod);
             switchClientCredentials(oldCredentials);
 
-            String response = postMethod.getResponseBodyAsString();
-            Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + response);
+            final String responseData = postMethod.getResponseBodyAsString();
+            Log_OC.d(TAG, "OAUTH2: raw response from POST TOKEN: " + responseData);
 
-            if (response != null && response.length() > 0) {
-                JSONObject tokenJson = new JSONObject(response);
-                Map<String, String> accessTokenResult =
-                    mResponseParser.parseAccessTokenResult(tokenJson);
-                if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
-                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
-                    result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);
+            if (responseData != null && responseData.length() > 0) {
+                final JSONObject tokenJson = new JSONObject(responseData);
 
-                } else {
-                    result = new RemoteOperationResult(true, postMethod);
-                    ArrayList<Object> data = new ArrayList<>();
-                    data.add(accessTokenResult);
-                    result.setData(data);
-                }
+                final Map<String, String> accessTokenResult =
+                        mResponseParser.parseAccessTokenResult(tokenJson);
+                final ArrayList<Object> resultData = new ArrayList<>(1);
+                resultData.add(accessTokenResult);
+                final RemoteOperationResult result = new RemoteOperationResult(ResultCode.OK);
+                result.setData(resultData);
+                return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
+                        accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
+                        ? new RemoteOperationResult(ResultCode.OAUTH2_ERROR)
+                        : result;
 
             } else {
-                result = new RemoteOperationResult(false, postMethod);
-                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+                return new RemoteOperationResult(postMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
-
-        } finally {
-            if (postMethod != null) {
-                postMethod.releaseConnection();    // let the connection available for other methods
-            }
+            return new RemoteOperationResult(e);
         }
-
-        return result;
     }
 
     private OwnCloudCredentials switchClientCredentials(OwnCloudCredentials newCredentials) {

From f1109924892befc1fcdd0ecb5ddfb4f5a1f1c324 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Tue, 19 Jun 2018 10:46:59 +0200
Subject: [PATCH 071/133] make oauth work

---
 .../OwnCloudBasicCredentials.java             |  4 ++++
 .../OwnCloudBearerCredentials.java            | 22 +++++++++++++++++++
 .../interceptors/BarearAuthInterceptor.java   | 21 ++++++++++++++++++
 .../files/ExistenceCheckRemoteOperation.java  |  8 +++----
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java

diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index ee0bf6bb..244d8520 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -25,6 +25,7 @@ package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
 
@@ -71,6 +72,9 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
             if (requestInterceptor instanceof BasicAuthInterceptor) {
                 requestInterceptors.remove(requestInterceptor);
             }
+            if(requestInterceptor instanceof BarearAuthInterceptor) {
+                requestInterceptors.remove(requestInterceptor);
+            }
         }
 
         HttpClient.getOkHttpInterceptor()
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
index 968d6703..1deb288b 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
@@ -23,6 +23,8 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
+import android.app.DownloadManager;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,6 +35,10 @@ import org.apache.commons.httpclient.auth.AuthState;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.authentication.oauth.BearerAuthScheme;
 import com.owncloud.android.lib.common.authentication.oauth.BearerCredentials;
+import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
 
 public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
@@ -49,6 +55,22 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
         AuthPolicy.registerAuthScheme(BearerAuthScheme.AUTH_POLICY, BearerAuthScheme.class);
         AuthPolicy.registerAuthScheme(AuthState.PREEMPTIVE_AUTH_SCHEME, BearerAuthScheme.class);
 
+        final ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors =
+                HttpClient.getOkHttpInterceptor().getRequestInterceptors();
+
+        // Clear previous basic credentials
+        for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
+            if (requestInterceptor instanceof BasicAuthInterceptor) {
+                requestInterceptors.remove(requestInterceptor);
+            }
+            if(requestInterceptor instanceof BarearAuthInterceptor) {
+                requestInterceptors.remove(requestInterceptor);
+            }
+        }
+
+        HttpClient.getOkHttpInterceptor()
+                .addRequestInterceptor(new BarearAuthInterceptor(mAccessToken));
+
         List<String> authPrefs = new ArrayList<>(1);
         authPrefs.add(BearerAuthScheme.AUTH_POLICY);
         client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java
new file mode 100644
index 00000000..4cf1f23d
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java
@@ -0,0 +1,21 @@
+package com.owncloud.android.lib.common.http.interceptors;
+
+import okhttp3.Request;
+
+public class BarearAuthInterceptor implements HttpInterceptor.RequestInterceptor {
+
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+    private final String mBarearToken;
+
+    public BarearAuthInterceptor(String barearToken) {
+        this.mBarearToken = barearToken;
+    }
+
+    @Override
+    public Request intercept(Request request) {
+        return request
+                .newBuilder()
+                .addHeader(AUTHORIZATION_HEADER, "Bearer " + mBarearToken)
+                .build();
+    }
+}
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index e9dbfd5a..cbce3612 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -25,7 +25,6 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
@@ -36,7 +35,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import java.sql.Time;
 import java.util.concurrent.TimeUnit;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -113,9 +111,9 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
              *  207 MULTI_STATUS: path exists.
              */
 
-            result = isSuccess(status) ?
-                    new RemoteOperationResult(OK) :
-                    new RemoteOperationResult(propfindMethod);
+            result = isSuccess(status)
+                    ? new RemoteOperationResult(OK)
+                    : new RemoteOperationResult(propfindMethod);
 
             Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +

From e261b1df2f1a3b4af8f9ef282412e716ca1738eb Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 19 Jun 2018 10:56:53 +0200
Subject: [PATCH 072/133] Abort upload [WIP]

---
 dav4android                                   |  2 +-
 .../common/http/methods/HttpBaseMethod.java   | 10 +++
 .../http/methods/nonwebdav/GetMethod.java     |  1 -
 .../http/methods/nonwebdav/HttpMethod.java    |  6 --
 .../common/http/methods/webdav/DavMethod.java | 10 +++
 .../common/http/methods/webdav/PutMethod.java |  2 +-
 .../files/DownloadRemoteFileOperation.java    | 29 +++---
 .../files/UploadRemoteFileOperation.java      | 88 +++++++++----------
 8 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/dav4android b/dav4android
index aec2f98c..fab24c47 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit aec2f98c69e4e86d148226c7ff00fe5dd2be49e4
+Subproject commit fab24c4727d4a201cbb0bb1e7f2f45bc5b5e0756
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 1f9524e0..1d6cdff6 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.Call;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -50,6 +51,7 @@ public abstract class HttpBaseMethod {
     protected Request mRequest;
     protected RequestBody mRequestBody;
     protected Response mResponse;
+    protected Call mCall;
 
     protected HttpBaseMethod (HttpUrl httpUrl) {
         mOkHttpClient = HttpClient.getOkHttpClient();
@@ -125,4 +127,12 @@ public abstract class HttpBaseMethod {
     public String getResponseHeader(String headerName) {
         return mResponse.header(headerName);
     }
+
+    public void abort() {
+        mCall.cancel();
+    }
+
+    public boolean isAborted() {
+        return mCall.isCanceled();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index 65a49f94..b24b9bce 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -46,5 +46,4 @@ public class GetMethod extends HttpMethod {
 
         return super.execute();
     }
-
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 804d39f5..a439b03b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -38,8 +38,6 @@ import okhttp3.HttpUrl;
  */
 public abstract class HttpMethod extends HttpBaseMethod {
 
-    private Call mCall;
-
     public HttpMethod(HttpUrl httpUrl) {
         super(httpUrl);
     }
@@ -50,8 +48,4 @@ public abstract class HttpMethod extends HttpBaseMethod {
         mResponse = mCall.execute();
         return super.getStatusCode();
     }
-
-    public void abort() {
-        mCall.cancel();
-    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index dfa293a6..c9c8c00a 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -49,4 +49,14 @@ public abstract class DavMethod extends HttpBaseMethod {
     public DavResource getDavResource() {
         return mDavResource;
     }
+
+    @Override
+    public void abort() {
+        mDavResource.cancelCall();
+    }
+
+    @Override
+    public boolean isAborted() {
+        return mDavResource.isCallAborted();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index f3667099..020bdcad 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -67,4 +67,4 @@ public class PutMethod extends DavMethod {
 
         return super.getStatusCode();
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 13a387c7..e3a62d75 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -24,16 +24,6 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
@@ -44,6 +34,16 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import okhttp3.HttpUrl;
 
 /**
@@ -98,7 +98,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
 
 
     private RemoteOperationResult downloadFile(OwnCloudClient client, File targetFile) throws
-        IOException, OperationCancelledException {
+            Exception {
 
         RemoteOperationResult result;
         int status;
@@ -128,7 +128,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                 while ((readResult = bis.read(bytes)) != -1) {
                     synchronized (mCancellationRequested) {
                         if (mCancellationRequested.get()) {
-                             mGet.abort();
+                            mGet.abort();
                             throw new OperationCancelledException();
                         }
                     }
@@ -174,9 +174,6 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
             result = isSuccess(status)
                     ? new RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
                     : new RemoteOperationResult(mGet);
-
-        } catch (Exception e) {
-            return new RemoteOperationResult(e);
         } finally {
             if (fos != null) fos.close();
             if (bis != null) bis.close();
@@ -218,4 +215,4 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
     public String getEtag() {
         return mEtag;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 635fbd17..5f2c5933 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -113,13 +113,13 @@ public class UploadRemoteFileOperation extends RemoteOperation {
             }
 
         } catch (Exception e) {
-//            if (mPutMethod != null && mPutMethod.isAborted()) {
-//                result = new RemoteOperationResult(new OperationCancelledException());
-//
-//            } else {
-//                result = new RemoteOperationResult(e);
-//            }
+            if (mPutMethod != null && mPutMethod.isAborted()) {
+                result = new RemoteOperationResult(new OperationCancelledException());
+            } else {
+                result = new RemoteOperationResult(e);
+            }
         } finally {
+            // TODO
             // reset previous retry handler
 //            client.getParams().setParameter(
 //                HttpMethodParams.RETRY_HANDLER,
@@ -129,47 +129,41 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         return result;
     }
 
-    protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
-        RemoteOperationResult result;
-        try {
-            File fileToUpload = new File(mLocalPath);
+    protected RemoteOperationResult uploadFile(OwnCloudClient client) throws Exception {
 
-            MediaType mediaType = MediaType.parse(mMimeType);
+        File fileToUpload = new File(mLocalPath);
 
-            mFileRequestBody = new FileRequestBody(fileToUpload, mediaType);
+        MediaType mediaType = MediaType.parse(mMimeType);
 
-            synchronized (mDataTransferListeners) {
-                mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
-            }
+        mFileRequestBody = new FileRequestBody(fileToUpload, mediaType);
 
-            if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-                mPutMethod.addRequestHeader(HttpConstants.IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
-            }
-
-            mPutMethod.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()));
-
-            mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-
-            RequestBody requestBody = new MultipartBody.Builder()
-                    .setType(MultipartBody.FORM)
-                    .addPart(mFileRequestBody)
-                    .build();
-
-            mPutMethod.setRequestBody(requestBody);
-
-            int status = client.executeHttpMethod(mPutMethod);
-
-            if (isSuccess(status)) {
-                result = new RemoteOperationResult(OK);
-
-            } else { // synchronization failed
-                result = new RemoteOperationResult(mPutMethod);
-            }
-
-        } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+        synchronized (mDataTransferListeners) {
+            mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
+        }
+
+        if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
+            mPutMethod.addRequestHeader(HttpConstants.IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
+        }
+
+        mPutMethod.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()));
+
+        mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+
+        RequestBody requestBody = new MultipartBody.Builder()
+                .setType(MultipartBody.FORM)
+                .addPart(mFileRequestBody)
+                .build();
+
+        mPutMethod.setRequestBody(requestBody);
+
+        int status = client.executeHttpMethod(mPutMethod);
+
+        if (isSuccess(status)) {
+            return new RemoteOperationResult(OK);
+
+        } else { // synchronization failed
+            return new RemoteOperationResult(mPutMethod);
         }
-        return result;
     }
 
     public Set<OnDatatransferProgressListener> getDataTransferListeners() {
@@ -195,11 +189,11 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     }
     
     public void cancel() {
-//        synchronized (mCancellationRequested) {
-//            mCancellationRequested.set(true);
-//            if (mPutMethod != null)
-//                mPutMethod.abort();
-//        }
+        synchronized (mCancellationRequested) {
+            mCancellationRequested.set(true);
+            if (mPutMethod != null)
+                mPutMethod.abort();
+        }
     }
 
     public boolean isSuccess(int status) {

From 804b31da394b13c3de683aac806d5d8bd3e19aac Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Tue, 19 Jun 2018 12:48:19 +0200
Subject: [PATCH 073/133] make saml work with new library

---
 .../OwnCloudBasicCredentials.java             | 11 +++---
 .../OwnCloudBearerCredentials.java            | 10 ++---
 .../OwnCloudSamlSsoCredentials.java           | 38 ++++++++++---------
 .../interceptors/SamlAuthInterceptor.java     | 21 ++++++++++
 4 files changed, 52 insertions(+), 28 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java

diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 244d8520..39e67b99 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -27,7 +27,9 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
 
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;
@@ -68,11 +70,10 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         ArrayList<RequestInterceptor> requestInterceptors = HttpClient.getOkHttpInterceptor().getRequestInterceptors();
 
         // Clear previous basic credentials
-        for (RequestInterceptor requestInterceptor : requestInterceptors) {
-            if (requestInterceptor instanceof BasicAuthInterceptor) {
-                requestInterceptors.remove(requestInterceptor);
-            }
-            if(requestInterceptor instanceof BarearAuthInterceptor) {
+        for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
+            if (requestInterceptor instanceof BasicAuthInterceptor
+                    || requestInterceptor instanceof BarearAuthInterceptor
+                    || requestInterceptor instanceof SamlAuthInterceptor) {
                 requestInterceptors.remove(requestInterceptor);
             }
         }
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
index 1deb288b..6b3e1614 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
@@ -39,6 +39,7 @@ import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
 
 public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
@@ -60,11 +61,10 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
         // Clear previous basic credentials
         for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
-            if (requestInterceptor instanceof BasicAuthInterceptor) {
-                requestInterceptors.remove(requestInterceptor);
-            }
-            if(requestInterceptor instanceof BarearAuthInterceptor) {
-                requestInterceptors.remove(requestInterceptor);
+            if (requestInterceptor instanceof BasicAuthInterceptor
+                || requestInterceptor instanceof BarearAuthInterceptor
+                || requestInterceptor instanceof SamlAuthInterceptor) {
+                    requestInterceptors.remove(requestInterceptor);
             }
         }
 
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index cf7036b0..0828b7c7 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -23,12 +23,20 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-import org.apache.commons.httpclient.Cookie;
 import org.apache.commons.httpclient.cookie.CookiePolicy;
 
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
+
+import java.util.ArrayList;
+
+import okhttp3.Cookie;
 
 public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 
@@ -46,26 +54,20 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
         client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
         client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
 
-        // TODO
-//        client.setFollowRedirects(false);
+        final ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors =
+                HttpClient.getOkHttpInterceptor().getRequestInterceptors();
 
-        Uri serverUri = client.getBaseUri();
-
-        String[] cookies = mSessionCookie.split(";");
-        if (cookies.length > 0) {
-            Cookie cookie = null;
-            for (int i = 0; i < cookies.length; i++) {
-                int equalPos = cookies[i].indexOf('=');
-                if (equalPos >= 0) {
-                    cookie = new Cookie();
-                    cookie.setName(cookies[i].substring(0, equalPos));
-                    cookie.setValue(cookies[i].substring(equalPos + 1));
-                    cookie.setDomain(serverUri.getHost());    // VERY IMPORTANT
-                    cookie.setPath(serverUri.getPath());    // VERY IMPORTANT
-                    client.getState().addCookie(cookie);
-                }
+        // Clear previous basic credentials
+        for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
+            if (requestInterceptor instanceof BasicAuthInterceptor
+                    || requestInterceptor instanceof BarearAuthInterceptor
+                    || requestInterceptor instanceof SamlAuthInterceptor) {
+                requestInterceptors.remove(requestInterceptor);
             }
         }
+
+        HttpClient.getOkHttpInterceptor()
+                .addRequestInterceptor(new SamlAuthInterceptor(mSessionCookie));
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java
new file mode 100644
index 00000000..8651456e
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java
@@ -0,0 +1,21 @@
+package com.owncloud.android.lib.common.http.interceptors;
+
+import java.io.IOException;
+
+import okhttp3.Request;
+
+public class SamlAuthInterceptor implements HttpInterceptor.RequestInterceptor {
+
+    private final String mSessionCookie;
+
+    public SamlAuthInterceptor(String sessionCookie) {
+        this.mSessionCookie = sessionCookie;
+    }
+
+    @Override
+    public Request intercept(Request request) throws IOException {
+        return request.newBuilder()
+                .addHeader("Cookie", mSessionCookie)
+                .build();
+    }
+}

From 45e4b98510524faa7584fc1bcc2961aa8eed0d7e Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 19 Jun 2018 17:58:10 +0200
Subject: [PATCH 074/133] Abort uploads with no chunking working

---
 .../android/lib/common/network/FileRequestBody.java    |  5 +++++
 .../lib/resources/files/UploadRemoteFileOperation.java | 10 +---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
index cd938562..9c4b30ac 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestBody.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
@@ -57,6 +57,11 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans
         return mContentType;
     }
 
+    @Override
+    public long contentLength() {
+        return mFile.length();
+    }
+
     @Override
     public void writeTo(BufferedSink sink) {
         Source source;
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 5f2c5933..6683af46 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -36,14 +36,11 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -149,12 +146,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
         mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
 
-        RequestBody requestBody = new MultipartBody.Builder()
-                .setType(MultipartBody.FORM)
-                .addPart(mFileRequestBody)
-                .build();
-
-        mPutMethod.setRequestBody(requestBody);
+        mPutMethod.setRequestBody(mFileRequestBody);
 
         int status = client.executeHttpMethod(mPutMethod);
 

From c2bdea1c91060ebae40093e6cee5146aec539fa2 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 21 Jun 2018 09:44:07 +0200
Subject: [PATCH 075/133] make https connection work with new library

---
 .../android/lib/common/OwnCloudClient.java    | 63 ++++++++++---------
 .../android/lib/common/http/HttpClient.java   | 39 ++++++++++--
 .../lib/common/network/NetworkUtils.java      |  2 +-
 .../operations/RemoteOperationResult.java     | 29 ++++++---
 .../status/GetRemoteStatusOperation.java      | 14 ++++-
 5 files changed, 99 insertions(+), 48 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index dd01ddb4..642586c8 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -1,23 +1,23 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2018 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
- *   
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -35,6 +35,7 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
@@ -247,7 +248,7 @@ public class OwnCloudClient extends HttpClient {
             preventCrashDueToInvalidPort(method);
 
             Log_OC.d(TAG + " #" + mInstanceNumber, "REQUEST " +
-            method.getName() + " " + method.getPath());
+                    method.getName() + " " + method.getPath());
 
             //logCookiesAtRequest(method.getRequestHeaders(), "before");
             //logCookiesAtState("before");
@@ -292,6 +293,8 @@ public class OwnCloudClient extends HttpClient {
         } while (repeatWithFreshCredentials);
 
         return status;
+
+
     }
 
     private void checkFirstRedirection(HttpMethod method) {
@@ -338,10 +341,10 @@ public class OwnCloudClient extends HttpClient {
         RedirectionPath result = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
 
         while (redirectionsCount < MAX_REDIRECTIONS_COUNT &&
-            (status == HttpStatus.SC_MOVED_PERMANENTLY ||
-                status == HttpStatus.SC_MOVED_TEMPORARILY ||
-                status == HttpStatus.SC_TEMPORARY_REDIRECT)
-            ) {
+                (status == HttpStatus.SC_MOVED_PERMANENTLY ||
+                        status == HttpStatus.SC_MOVED_TEMPORARILY ||
+                        status == HttpStatus.SC_TEMPORARY_REDIRECT)
+                ) {
 
             Header location = method.getResponseHeader("Location");
             if (location == null) {
@@ -351,7 +354,7 @@ public class OwnCloudClient extends HttpClient {
                 String locationStr = location.getValue();
 
                 Log_OC.d(TAG + " #" + mInstanceNumber,
-                    "Location to redirect: " + locationStr);
+                        "Location to redirect: " + locationStr);
 
                 result.addLocation(locationStr);
 
@@ -401,7 +404,7 @@ public class OwnCloudClient extends HttpClient {
 
             } catch (IOException io) {
                 Log_OC.e(TAG, "Unexpected exception while exhausting not interesting HTTP response;" +
-                    " will be IGNORED", io);
+                        " will be IGNORED", io);
             }
         }
     }
@@ -456,8 +459,8 @@ public class OwnCloudClient extends HttpClient {
         for (int i = 0; i < headers.length; i++) {
             if (headers[i].getName().toLowerCase().equals("cookie")) {
                 Log_OC.d(TAG + " #" + mInstanceNumber,
-                    "Cookies at request (" + when + ") (" + counter++ + "): " +
-                        headers[i].getValue());
+                        "Cookies at request (" + when + ") (" + counter++ + "): " +
+                                headers[i].getValue());
             }
         }
         if (counter == 0) {
@@ -473,10 +476,10 @@ public class OwnCloudClient extends HttpClient {
             Log_OC.d(TAG + " #" + mInstanceNumber, "Cookies at STATE (before)");
             for (int i = 0; i < cookies.length; i++) {
                 Log_OC.d(TAG + " #" + mInstanceNumber, "    (" + i + "):" +
-                    "\n        name: " + cookies[i].getName() +
-                    "\n        value: " + cookies[i].getValue() +
-                    "\n        domain: " + cookies[i].getDomain() +
-                    "\n        path: " + cookies[i].getPath()
+                        "\n        name: " + cookies[i].getName() +
+                        "\n        value: " + cookies[i].getValue() +
+                        "\n        domain: " + cookies[i].getDomain() +
+                        "\n        path: " + cookies[i].getPath()
                 );
             }
         }
@@ -487,7 +490,7 @@ public class OwnCloudClient extends HttpClient {
         for (int i = 0; i < headers.length; i++) {
             if (headers[i].getName().toLowerCase().equals("set-cookie")) {
                 Log_OC.d(TAG + " #" + mInstanceNumber,
-                    "Set-Cookie (" + counter++ + "): " + headers[i].getValue());
+                        "Set-Cookie (" + counter++ + "): " + headers[i].getValue());
             }
         }
         if (counter == 0) {
@@ -523,7 +526,7 @@ public class OwnCloudClient extends HttpClient {
         Log_OC.d(TAG, "       path: " + cookie.getPath());
         Log_OC.d(TAG, "       version: " + cookie.getVersion());
         Log_OC.d(TAG, "       expiryDate: " +
-            (cookie.getExpiryDate() != null ? cookie.getExpiryDate().toString() : "--"));
+                (cookie.getExpiryDate() != null ? cookie.getExpiryDate().toString() : "--"));
         Log_OC.d(TAG, "       comment: " + cookie.getComment());
         Log_OC.d(TAG, "       secure: " + cookie.getSecure());
     }
@@ -584,7 +587,7 @@ public class OwnCloudClient extends HttpClient {
 
             if (invalidated) {
                 if (getCredentials().authTokenCanBeRefreshed() &&
-                    repeatCounter < MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS) {
+                        repeatCounter < MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS) {
 
                     try {
                         mAccount.loadCredentials(mContext);
@@ -594,9 +597,9 @@ public class OwnCloudClient extends HttpClient {
 
                     } catch (AccountsException | IOException e) {
                         Log_OC.e(
-                            TAG,
-                            "Error while trying to refresh auth token for " + mAccount.getSavedAccount().name,
-                            e
+                                TAG,
+                                "Error while trying to refresh auth token for " + mAccount.getSavedAccount().name,
+                                e
                         );
                     }
                 }
@@ -627,7 +630,7 @@ public class OwnCloudClient extends HttpClient {
         boolean should = (httpStatusCode == HttpStatus.SC_UNAUTHORIZED || isIdPRedirection());   // invalid credentials
 
         should &= (mCredentials != null &&         // real credentials
-            !(mCredentials instanceof OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials));
+                !(mCredentials instanceof OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials));
 
         // test if have all the needed to effectively invalidate ...
         should &= (mAccount != null && mAccount.getSavedAccount() != null && mContext != null);
@@ -646,8 +649,8 @@ public class OwnCloudClient extends HttpClient {
     private boolean invalidateAccountCredentials() {
         AccountManager am = AccountManager.get(mContext);
         am.invalidateAuthToken(
-            mAccount.getSavedAccount().type,
-            mCredentials.getAuthToken()
+                mAccount.getSavedAccount().type,
+                mCredentials.getAuthToken()
         );
         am.clearPassword(mAccount.getSavedAccount()); // being strict, only needed for Basic Auth credentials
         return true;
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 3dfc8f7b..76af65e9 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -24,12 +24,25 @@
 
 package com.owncloud.android.lib.common.http;
 
+import android.content.Context;
+
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
+import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
+import com.owncloud.android.lib.common.network.NetworkUtils;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 
 import java.util.Arrays;
 
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 
@@ -38,17 +51,33 @@ import okhttp3.Protocol;
  * @author David González Verdugo
  */
 public class HttpClient {
+    private static final String TAG = HttpClient.class.toString();
 
     private static OkHttpClient sOkHttpClient;
     private static HttpInterceptor sOkHttpInterceptor;
+    private static Context sContext;
+
+    public static void setContext(Context context) {
+        sContext = context;
+    }
 
     public static OkHttpClient getOkHttpClient() {
         if (sOkHttpClient == null) {
-            sOkHttpClient = new OkHttpClient.Builder()
-                    .addInterceptor(getOkHttpInterceptor())
-                    .protocols(Arrays.asList(Protocol.HTTP_1_1))
-                    .followRedirects(false)
-                    .build();
+            try {
+                final X509TrustManager trustManager = new AdvancedX509TrustManager(
+                        NetworkUtils.getKnownServersStore(sContext));
+                final SSLContext sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(null, new TrustManager[] {trustManager}, null);
+                sOkHttpClient = new OkHttpClient.Builder()
+                        .addInterceptor(getOkHttpInterceptor())
+                        .protocols(Arrays.asList(Protocol.HTTP_1_1))
+                        .followRedirects(false)
+                        .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
+                        .hostnameVerifier(new BrowserCompatHostnameVerifier())
+                        .build();
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Could not setup SSL system.", e);
+            }
         }
         return sOkHttpClient;
     }
diff --git a/src/com/owncloud/android/lib/common/network/NetworkUtils.java b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
index a6e422b5..b5fa0cde 100644
--- a/src/com/owncloud/android/lib/common/network/NetworkUtils.java
+++ b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
@@ -147,7 +147,7 @@ public class NetworkUtils {
      * @throws CertificateException         When an exception occurred while loading the certificates from the local 
      * 										trust store.
      */
-    private static KeyStore getKnownServersStore(Context context) 
+    public static KeyStore getKnownServersStore(Context context)
     		throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
         if (mKnownServersStore == null) {
             //mKnownServersStore = KeyStore.getInstance("BKS");
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 6669fa8b..4b1d1347 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -53,10 +53,15 @@ import java.util.List;
 import java.util.Map;
 
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLPeerUnverifiedException;
 
 import okhttp3.Headers;
 
 
+
+
+
+
 /**
  * The result of a remote operation required to an ownCloud server.
  *
@@ -191,17 +196,21 @@ public class RemoteOperationResult implements Serializable {
             mCode = ResultCode.ACCOUNT_EXCEPTION;
 
         } else if (e instanceof SSLException || e instanceof RuntimeException) {
-            CertificateCombinedException se = getCertificateCombinedException(e);
-            if (se != null) {
-                mException = se;
-                if (se.isRecoverable()) {
-                    mCode = ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
-                }
-            } else if (e instanceof RuntimeException) {
-                mCode = ResultCode.HOST_NOT_AVAILABLE;
-
+            if(e instanceof SSLPeerUnverifiedException) {
+                mCode = ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
             } else {
-                mCode = ResultCode.SSL_ERROR;
+                CertificateCombinedException se = getCertificateCombinedException(e);
+                if (se != null) {
+                    mException = se;
+                    if (se.isRecoverable()) {
+                        mCode = ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
+                    }
+                } else if (e instanceof RuntimeException) {
+                    mCode = ResultCode.HOST_NOT_AVAILABLE;
+
+                } else {
+                    mCode = ResultCode.SSL_ERROR;
+                }
             }
 
         } else if (e instanceof FileNotFoundException) {
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index abb76398..6a4d5a2f 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -40,11 +40,15 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.security.cert.CertPathValidatorException;
 import java.sql.Time;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.SSLPeerUnverifiedException;
+
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
 
 /**
  * Checks if the server is valid and if the server supports the Share API
@@ -87,9 +91,15 @@ public class GetRemoteStatusOperation extends RemoteOperation {
             getMethod.setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
             getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
 
-            int status = client.executeHttpMethod(getMethod);
+            int status;
+            try {
+                status = client.executeHttpMethod(getMethod);
+                mLatestResult = new RemoteOperationResult(OK);
+            } catch (SSLPeerUnverifiedException certEx) {
+                mLatestResult = new RemoteOperationResult(certEx);
+                return false;
+            }
 
-            mLatestResult = new RemoteOperationResult(OK);
 
             boolean isRedirectToNonSecureConnection = false;
 

From d013d93ac9d702312d83dca0ae2456b1d22c3910 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 21 Jun 2018 13:59:23 +0200
Subject: [PATCH 076/133] Retry uploads

---
 dav4android                                   |  2 +-
 .../common/http/methods/HttpBaseMethod.java   | 11 ++++++++
 .../common/http/methods/webdav/DavMethod.java | 12 ++++++++
 .../files/UploadRemoteFileOperation.java      | 28 ++++++++-----------
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/dav4android b/dav4android
index fab24c47..d519949b 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit fab24c4727d4a201cbb0bb1e7f2f45bc5b5e0756
+Subproject commit d519949bcc53896becb7ad92bc643938f189d04e
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 1d6cdff6..811194bf 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -60,6 +60,7 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
+    // Connection parameters
     public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
         mOkHttpClient = mOkHttpClient.newBuilder()
                 .readTimeout(readTimeout, timeUnit)
@@ -78,6 +79,16 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
+    public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .retryOnConnectionFailure(retryOnConnectionFailure)
+                .build();
+    }
+
+    public boolean getRetryOnConnectionFailure() {
+        return mOkHttpClient.retryOnConnectionFailure();
+    }
+
     // Request
     public String getRequestHeader(String name) {
         return mRequest.header(name);
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index c9c8c00a..7d7d9e6d 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -26,6 +26,8 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
+import java.util.concurrent.TimeUnit;
+
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import okhttp3.HttpUrl;
@@ -59,4 +61,14 @@ public abstract class DavMethod extends HttpBaseMethod {
     public boolean isAborted() {
         return mDavResource.isCallAborted();
     }
+
+    @Override
+    public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
+        mDavResource.setRetryOnConnectionFailure(retryOnConnectionFailure);
+    }
+
+    @Override
+    public boolean getRetryOnConnectionFailure() {
+        return mDavResource.isRetryOnConnectionFailure();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 6683af46..3fbd1119 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -34,6 +34,7 @@ import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;
 import java.util.HashSet;
@@ -86,20 +87,12 @@ public class UploadRemoteFileOperation extends RemoteOperation {
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
 
-//        DefaultHttpMethodRetryHandler oldRetryHandler =
-//            (DefaultHttpMethodRetryHandler) client.getParams().getParameter(HttpMethodParams.RETRY_HANDLER);
-
         try {
-            // TODO
-            // prevent that uploads are retried automatically by network library
-//            client.getParams().setParameter(
-//                HttpMethodParams.RETRY_HANDLER,
-//                new DefaultHttpMethodRetryHandler(0, false)
-//            );
-
             mPutMethod = new PutMethod(
                     HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
 
+            mPutMethod.setRetryOnConnectionFailure(false);
+
             if (mCancellationRequested.get()) {
                 // the operation was cancelled before getting it's turn to be executed in the queue of uploads
                 result = new RemoteOperationResult(new OperationCancelledException());
@@ -107,22 +100,23 @@ public class UploadRemoteFileOperation extends RemoteOperation {
             } else {
                 // perform the upload
                 result = uploadFile(client);
+                Log_OC.i(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " +
+                        result.getLogMessage());
             }
 
         } catch (Exception e) {
+
             if (mPutMethod != null && mPutMethod.isAborted()) {
                 result = new RemoteOperationResult(new OperationCancelledException());
+                Log_OC.e(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " +
+                        result.getLogMessage(), new OperationCancelledException());
             } else {
                 result = new RemoteOperationResult(e);
+                Log_OC.e(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " +
+                        result.getLogMessage(), e);
             }
-        } finally {
-            // TODO
-            // reset previous retry handler
-//            client.getParams().setParameter(
-//                HttpMethodParams.RETRY_HANDLER,
-//                oldRetryHandler
-//            );
         }
+
         return result;
     }
 

From f218a6061159c5b3e6d40a2271b3887d0b53a2f2 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 22 Jun 2018 09:30:08 +0200
Subject: [PATCH 077/133] Include more methods to custom dav connections +
 chunked uploads [WIP]

---
 dav4android                                   |  2 +-
 .../common/http/methods/webdav/DavMethod.java | 16 +++++++
 .../ChunkedUploadRemoteFileOperation.java     | 43 +++++++++++--------
 .../files/CreateRemoteFolderOperation.java    |  5 +--
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/dav4android b/dav4android
index d519949b..922b22b4 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit d519949bcc53896becb7ad92bc643938f189d04e
+Subproject commit 922b22b4e1f40d72d54f5f47db02cd962f46acab
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index 7d7d9e6d..70ee38b2 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -62,6 +62,22 @@ public abstract class DavMethod extends HttpBaseMethod {
         return mDavResource.isCallAborted();
     }
 
+    // Connection parameters
+    @Override
+    public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
+        mDavResource.setReadTimeout(readTimeout, timeUnit);
+    }
+
+    @Override
+    public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
+        mDavResource.setConnectionTimeout(connectionTimeout, timeUnit);
+    }
+
+    @Override
+    public void setFollowRedirects(boolean followRedirects) {
+        mDavResource.setFollowRedirects(followRedirects);
+    }
+
     @Override
     public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
         mDavResource.setRetryOnConnectionFailure(retryOnConnectionFailure);
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index cc1555b2..373d1bb1 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -24,24 +24,15 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.MkColMethod;
+import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
-import java.util.Random;
-
-import org.apache.commons.httpclient.methods.PutMethod;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.network.ChunkFromFileChannelRequestEntity;
-import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
-
 
 public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
 
@@ -53,16 +44,17 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
     private static final String OC_CHUNK_X_OC_MTIME_HEADER = "X-OC-Mtime";
     private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();
 
+    private long mTransferId;
+
     public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType,
                                             String fileLastModifTimestamp) {
         super(storagePath, remotePath, mimeType, fileLastModifTimestamp);
     }
 
-    public ChunkedUploadRemoteFileOperation(
-        String storagePath, String remotePath, String mimeType, String requiredEtag,
-        String fileLastModifTimestamp
-    ) {
+    public ChunkedUploadRemoteFileOperation(long transferId, String storagePath, String remotePath, String mimeType,
+                                            String requiredEtag, String fileLastModifTimestamp) {
         super(storagePath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
+        mTransferId = transferId;
     }
 
     @Override
@@ -73,6 +65,19 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
         FileChannel channel = null;
         RandomAccessFile raf = null;
 
+        //MKCOL
+        try {
+            MkColMethod mkcol = new MkColMethod(
+                    HttpUtils.stringUrlToHttpUrl(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath))
+            );
+
+            String a = "";
+        } catch (Exception e) {
+
+            String b = "";
+        }
+
+
         //TODO
 //        try {
 //            File file = new File(mLocalPath);
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 774d3a06..214afb92 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -117,7 +117,6 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage(), e);
-
         }
 
         return result;
@@ -128,6 +127,4 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
             mCreateFullPath);
         return operation.execute(client);
     }
-
-
-}
+}
\ No newline at end of file

From 2d54ece72e6177e94baa45fb6fdd55feb6b8346b Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 22 Jun 2018 15:06:42 +0200
Subject: [PATCH 078/133] Chunked uploads, create chunks folder [WIP]

---
 .../android/lib/common/OwnCloudClient.java    | 23 +++++++++++-------
 .../lib/common/accounts/AccountUtils.java     |  6 +----
 .../ChunkedUploadRemoteFileOperation.java     | 18 ++------------
 .../files/CopyRemoteFileOperation.java        |  4 ++--
 .../files/CreateRemoteFolderOperation.java    | 24 ++++++++++---------
 .../files/DownloadRemoteFileOperation.java    |  3 +--
 .../files/ExistenceCheckRemoteOperation.java  |  6 ++---
 .../lib/resources/files/FileUtils.java        |  4 +---
 .../files/MoveRemoteFileOperation.java        |  4 ++--
 .../files/ReadRemoteFileOperation.java        |  2 +-
 .../files/ReadRemoteFolderOperation.java      |  2 +-
 .../lib/resources/files/RemoteFile.java       |  4 ++--
 .../files/RemoveRemoteFileOperation.java      |  2 +-
 .../files/RenameRemoteFileOperation.java      |  4 ++--
 .../files/UploadRemoteFileOperation.java      |  2 +-
 .../users/GetRemoteUserQuotaOperation.java    |  2 +-
 16 files changed, 48 insertions(+), 62 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 642586c8..f21c9d18 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -35,7 +35,6 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
@@ -58,7 +57,8 @@ import java.io.InputStream;
 public class OwnCloudClient extends HttpClient {
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
-    public static final String NEW_WEBDAV_PATH_4_0 = "/remote.php/dav/files/";
+    public static final String NEW_WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/";
+    public static final String NEW_WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/files/";
     public static final String STATUS_PATH = "/status.php";
     public static final String FILES_WEB_PATH = "/index.php/apps/files";
 
@@ -284,7 +284,8 @@ public class OwnCloudClient extends HttpClient {
         int status;
 
         do {
-            method.setFollowRedirects(mFollowRedirects);
+            //TODO Dav4Android doesn't allow follow redirections right now
+//            method.setFollowRedirects(mFollowRedirects);
             status = method.execute();
             repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
             if (repeatWithFreshCredentials) {
@@ -293,8 +294,6 @@ public class OwnCloudClient extends HttpClient {
         } while (repeatWithFreshCredentials);
 
         return status;
-
-
     }
 
     private void checkFirstRedirection(HttpMethod method) {
@@ -422,14 +421,20 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-    public Uri getWebdavUri() {
+    public Uri getOldFilesWebdavUri() {
         return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
     }
 
-    public Uri getNewWebDavUri() {
+    public Uri getNewFilesWebDavUri() {
         return mCredentials instanceof OwnCloudAnonymousCredentials
-                ? Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0)
-                : Uri.parse(mBaseUri + NEW_WEBDAV_PATH_4_0 + mCredentials.getUsername());
+                ? Uri.parse(mBaseUri + NEW_WEBDAV_FILES_PATH_4_0)
+                : Uri.parse(mBaseUri + NEW_WEBDAV_FILES_PATH_4_0 + mCredentials.getUsername());
+    }
+
+    public Uri getNewUploadsWebDavUri() {
+        return mCredentials instanceof OwnCloudAnonymousCredentials
+                ? Uri.parse(mBaseUri + NEW_WEBDAV_UPLOADS_PATH_4_0)
+                : Uri.parse(mBaseUri + NEW_WEBDAV_UPLOADS_PATH_4_0 + mCredentials.getUsername());
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index a93ad141..4b2df189 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -28,7 +28,6 @@ package com.owncloud.android.lib.common.accounts;
 import java.io.IOException;
 
 import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.HttpStatus;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -38,12 +37,9 @@ import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
@@ -239,7 +235,7 @@ public class AccountUtils {
             // Account Manager
             AccountManager am = AccountManager.get(context.getApplicationContext());
 
-            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getWebdavUri();
+            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getOldFilesWebdavUri();
 
             String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
             if (cookiesString != null) {
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 373d1bb1..4ba4dedf 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -65,19 +65,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
         FileChannel channel = null;
         RandomAccessFile raf = null;
 
-        //MKCOL
-        try {
-            MkColMethod mkcol = new MkColMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath))
-            );
-
-            String a = "";
-        } catch (Exception e) {
-
-            String b = "";
-        }
-
-
         //TODO
 //        try {
 //            File file = new File(mLocalPath);
@@ -90,7 +77,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 //            }
 //
 //            long offset = 0;
-//            String uriPrefix = client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath) +
+//            String uriPrefix = client.getOldWebdavUri() + WebdavUtils.encodePath(mRemotePath) +
 //                "-chunking-" + Math.abs((new Random()).nextInt(9000) + 1000) + "-";
 //            long totalLength = file.length();
 //            long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
@@ -154,5 +141,4 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 //        }
         return result;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index 6ee51d38..2138b226 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -104,8 +104,8 @@ public class CopyRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult result = null;
         try {
             CopyMethod copyMethod = new CopyMethod(
-                    HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
-                    client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
+                    HttpUrl.parse(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
+                    client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
             copyMethod.setReadTimeout(COPY_READ_TIMEOUT, TimeUnit.SECONDS);
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 214afb92..80763d4e 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -25,6 +25,8 @@
 package com.owncloud.android.lib.resources.files;
 
 
+import android.net.Uri;
+
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.MkColMethod;
@@ -53,20 +55,20 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
     private static final int READ_TIMEOUT = 30000;
     private static final int CONNECTION_TIMEOUT = 5000;
 
-
-    protected String mRemotePath;
-    protected boolean mCreateFullPath;
+    private String mRemotePath;
+    private boolean mCreateFullPath;
+    private boolean mFolderToSaveChunks;
 
     /**
      * Constructor
-     *
-     * @param remotePath     Full path to the new directory to create in the remote server.
-     * @param createFullPath 'True' means that all the ancestor folders should be created
-     *                       if don't exist yet.
+     *  @param remotePath     Full path to the new directory to create in the remote server.
+     * @param createFullPath 'True' means that all the ancestor folders should be created.
+     * @param folderToSaveChunks 'True' means that the folder to create is to save upload chunks.
      */
-    public CreateRemoteFolderOperation(String remotePath, boolean createFullPath) {
+    public CreateRemoteFolderOperation(String remotePath, boolean createFullPath, boolean folderToSaveChunks) {
         mRemotePath = remotePath;
         mCreateFullPath = createFullPath;
+        mFolderToSaveChunks = folderToSaveChunks;
     }
 
     /**
@@ -102,8 +104,8 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
     private RemoteOperationResult createFolder(OwnCloudClient client) {
         RemoteOperationResult result;
         try {
-            final MkColMethod mkcol = new MkColMethod(HttpUrl.parse(client.getWebdavUri()
-                    + WebdavUtils.encodePath(mRemotePath)));
+            Uri webDavUri = mFolderToSaveChunks ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
+            final MkColMethod mkcol = new MkColMethod(HttpUrl.parse(webDavUri + WebdavUtils.encodePath(mRemotePath)));
             mkcol.setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS);
             mkcol.setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS);
             final int status = client.executeHttpMethod(mkcol);
@@ -124,7 +126,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
 
     private RemoteOperationResult createParentFolder(String parentPath, OwnCloudClient client) {
         RemoteOperation operation = new CreateRemoteFolderOperation(parentPath,
-            mCreateFullPath);
+            mCreateFullPath, mFolderToSaveChunks);
         return operation.execute(client);
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index e3a62d75..057281cd 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -37,7 +37,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -103,7 +102,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult result;
         int status;
         boolean savedFile = false;
-        mGet = new GetMethod(HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)));
+        mGet = new GetMethod(HttpUrl.parse(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
         Iterator<OnDatatransferProgressListener> it;
 
         FileOutputStream fos = null;
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index cbce3612..cc6da844 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -88,7 +88,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
 //            client.setFollowRedirects(false);
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mPath)),
+                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0,
                     DavUtils.getAllPropset());
 
@@ -115,14 +115,14 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     ? new RemoteOperationResult(OK)
                     : new RemoteOperationResult(propfindMethod);
 
-            Log_OC.d(TAG, "Existence check for " + client.getWebdavUri() +
+            Log_OC.d(TAG, "Existence check for " + client.getOldFilesWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
                     "finished with HTTP status " + status + (!isSuccess(status) ? "(FAIL)" : ""));
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Existence check for " + client.getWebdavUri() +
+            Log_OC.e(TAG, "Existence check for " + client.getOldFilesWebdavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());
diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/src/com/owncloud/android/lib/resources/files/FileUtils.java
index 4edda969..2bca03b4 100644
--- a/src/com/owncloud/android/lib/resources/files/FileUtils.java
+++ b/src/com/owncloud/android/lib/resources/files/FileUtils.java
@@ -35,7 +35,6 @@ public class FileUtils {
 
 	public static final String PATH_SEPARATOR = "/";
 
-
 	public static String getParentPath(String remotePath) {
 		String parentPath = new File(remotePath).getParent();
 		parentPath = parentPath.endsWith(PATH_SEPARATOR) ? parentPath : parentPath + PATH_SEPARATOR;
@@ -82,5 +81,4 @@ public class FileUtils {
 		}
 		return result;
 	}
-	
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 26cdee54..180830ae 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -109,8 +109,8 @@ public class MoveRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult result = null;
         try {
             final MoveMethod move = new MoveMethod(
-                    HttpUrl.parse( client.getWebdavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
-                client.getWebdavUri() + WebdavUtils.encodePath(mTargetRemotePath),
+                    HttpUrl.parse( client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
+                client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
             move.setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 31ca2055..437118b5 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -79,7 +79,7 @@ public class ReadRemoteFileOperation extends RemoteOperation {
         try {
             // remote request
             propfind = new PropfindMethod(
-                    HttpUrl.parse(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    HttpUrl.parse(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DEPTH_0,
                     DavUtils.getAllPropset());
 
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 09cfe23e..4d2a22f7 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -75,7 +75,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 
         try {
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DavConstants.DEPTH_1,
                     DavUtils.getAllPropset());
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index bbb5159c..9c49c6c3 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -48,7 +48,7 @@ import at.bitfire.dav4android.property.owncloud.OCPrivatelink;
 import at.bitfire.dav4android.property.owncloud.OCSize;
 import okhttp3.HttpUrl;
 
-import static com.owncloud.android.lib.common.OwnCloudClient.NEW_WEBDAV_PATH_4_0;
+import static com.owncloud.android.lib.common.OwnCloudClient.NEW_WEBDAV_FILES_PATH_4_0;
 
 /**
  * Contains the data of a Remote File from a WebDavEntry
@@ -232,7 +232,7 @@ public class RemoteFile implements Parcelable, Serializable {
 
 
     private static String getRemotePathFromUrl(HttpUrl url, String displayName) {
-        final String pathToRemove = NEW_WEBDAV_PATH_4_0 + displayName;
+        final String pathToRemove = NEW_WEBDAV_FILES_PATH_4_0 + displayName;
         return Uri.decode(url.encodedPath()).replace(pathToRemove, "");
     }
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 3afb0761..24a47688 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -66,7 +66,7 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
 
         try {
             DeleteMethod deleteMethod = new DeleteMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath))
+                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath))
             );
 
             int status = client.executeHttpMethod(deleteMethod);
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index d6599dd9..ab1605a1 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -106,9 +106,9 @@ public class RenameRemoteFileOperation extends RemoteOperation {
                 return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
             }
 
-            final MoveMethod move = new MoveMethod(HttpUrl.parse(client.getWebdavUri() +
+            final MoveMethod move = new MoveMethod(HttpUrl.parse(client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mOldRemotePath)),
-                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
+                    client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
 
             move.setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
             move.setConnectionTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS);
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 3fbd1119..012bea79 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -89,7 +89,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
         try {
             mPutMethod = new PutMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
+                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
 
             mPutMethod.setRetryOnConnectionFailure(false);
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 9cdb9e1c..5dc16804 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -89,7 +89,7 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
         try {
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DEPTH_0,
                     DavUtils.getQuotaPropSet()
             );

From 297e8d1848f4bdf5c3d2e5d49d312ffa7b0ebfe6 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 25 Jun 2018 10:28:59 +0200
Subject: [PATCH 079/133] Chunked uploads, create chunks folder

---
 .../android/lib/common/OwnCloudClient.java    |  2 +-
 .../CreateRemoteChunkFolderOperation.java     | 43 +++++++++++++++++++
 .../files/CreateRemoteFolderOperation.java    | 12 +++---
 3 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index f21c9d18..c4bc58e7 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -58,7 +58,7 @@ public class OwnCloudClient extends HttpClient {
 
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
     public static final String NEW_WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/";
-    public static final String NEW_WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/files/";
+    public static final String NEW_WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/uploads/";
     public static final String STATUS_PATH = "/status.php";
     public static final String FILES_WEB_PATH = "/index.php/apps/files";
 
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java
new file mode 100644
index 00000000..8c5ecc17
--- /dev/null
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java
@@ -0,0 +1,43 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.files;
+
+/**
+ * Remote operation performing the creation of a new folder to save chunks during an upload to the ownCloud server.
+ *
+ * @author David González Verdugo
+ */
+public class CreateRemoteChunkFolderOperation extends CreateRemoteFolderOperation {
+    /**
+     * Constructor
+     *
+     * @param remotePath         Full path to the new directory to create in the remote server.
+     * @param createFullPath     'True' means that all the ancestor folders should be created.
+     */
+    public CreateRemoteChunkFolderOperation(String remotePath, boolean createFullPath) {
+        super(remotePath, createFullPath);
+        mFolderToSaveChunks = true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 80763d4e..798d9d51 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -57,18 +57,17 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
 
     private String mRemotePath;
     private boolean mCreateFullPath;
-    private boolean mFolderToSaveChunks;
+    protected boolean mFolderToSaveChunks;
 
     /**
      * Constructor
-     *  @param remotePath     Full path to the new directory to create in the remote server.
+     * @param remotePath     Full path to the new directory to create in the remote server.
      * @param createFullPath 'True' means that all the ancestor folders should be created.
-     * @param folderToSaveChunks 'True' means that the folder to create is to save upload chunks.
      */
-    public CreateRemoteFolderOperation(String remotePath, boolean createFullPath, boolean folderToSaveChunks) {
+    public CreateRemoteFolderOperation(String remotePath, boolean createFullPath) {
         mRemotePath = remotePath;
         mCreateFullPath = createFullPath;
-        mFolderToSaveChunks = folderToSaveChunks;
+        mFolderToSaveChunks = false;
     }
 
     /**
@@ -125,8 +124,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
     }
 
     private RemoteOperationResult createParentFolder(String parentPath, OwnCloudClient client) {
-        RemoteOperation operation = new CreateRemoteFolderOperation(parentPath,
-            mCreateFullPath, mFolderToSaveChunks);
+        RemoteOperation operation = new CreateRemoteFolderOperation(parentPath, mCreateFullPath);
         return operation.execute(client);
     }
 }
\ No newline at end of file

From 266dc37da21f2cc80063c944e534ef8c15ac2efc Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Mon, 25 Jun 2018 13:22:42 +0200
Subject: [PATCH 080/133] add stetho

---
 build.gradle                                           |  4 ++++
 .../owncloud/android/lib/common/http/HttpClient.java   | 10 ++++++++--
 .../android/lib/resources/files/RemoteFile.java        |  7 +++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index bd256738..6d4ced96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,10 @@ dependencies {
     api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
     api 'com.squareup.okhttp3:okhttp:3.10.0'
     api project(':dav4android')
+
+    // Used for network and database debuging
+    debugApi 'com.facebook.stetho:stetho:1.5.0'
+    debugApi 'com.facebook.stetho:stetho-okhttp3:1.5.0'
 }
 
 android {
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 76af65e9..9976de0f 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -26,6 +26,8 @@ package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
 
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.owncloud.android.lib.BuildConfig;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
@@ -68,13 +70,17 @@ public class HttpClient {
                         NetworkUtils.getKnownServersStore(sContext));
                 final SSLContext sslContext = SSLContext.getInstance("TLS");
                 sslContext.init(null, new TrustManager[] {trustManager}, null);
-                sOkHttpClient = new OkHttpClient.Builder()
+                OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
                         .addInterceptor(getOkHttpInterceptor())
                         .protocols(Arrays.asList(Protocol.HTTP_1_1))
                         .followRedirects(false)
                         .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
                         .hostnameVerifier(new BrowserCompatHostnameVerifier())
-                        .build();
+                if(BuildConfig.DEBUG) {
+                    clientBuilder.addNetworkInterceptor(new StethoInterceptor());
+                }
+                sOkHttpClient = clientBuilder.build();
+
             } catch (Exception e) {
                 Log_OC.e(TAG, "Could not setup SSL system.", e);
             }
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 9c49c6c3..73d44a5b 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -27,8 +27,10 @@ package com.owncloud.android.lib.resources.files;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.util.Log;
 
 import com.owncloud.android.lib.common.network.WebdavEntry;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -232,8 +234,9 @@ public class RemoteFile implements Parcelable, Serializable {
 
 
     private static String getRemotePathFromUrl(HttpUrl url, String displayName) {
-        final String pathToRemove = NEW_WEBDAV_FILES_PATH_4_0 + displayName;
-        return Uri.decode(url.encodedPath()).replace(pathToRemove, "");
+        final String davPath = NEW_WEBDAV_FILES_PATH_4_0 + displayName;
+        final String pathToOc = url.encodedPath().split(davPath)[0];
+        return Uri.decode(url.encodedPath()).replace(pathToOc + davPath, "");
     }
 
     /**

From 366459699e3564d819652f5c2e1535d588608f3c Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Mon, 25 Jun 2018 13:57:53 +0200
Subject: [PATCH 081/133] fix missing semicolon

---
 src/com/owncloud/android/lib/common/http/HttpClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 9976de0f..d7467ce7 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -75,7 +75,7 @@ public class HttpClient {
                         .protocols(Arrays.asList(Protocol.HTTP_1_1))
                         .followRedirects(false)
                         .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
-                        .hostnameVerifier(new BrowserCompatHostnameVerifier())
+                        .hostnameVerifier(new BrowserCompatHostnameVerifier());
                 if(BuildConfig.DEBUG) {
                     clientBuilder.addNetworkInterceptor(new StethoInterceptor());
                 }

From 153c0a10ff9e4103714b0aad30a9f5f7571c3c80 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 25 Jun 2018 15:32:00 +0200
Subject: [PATCH 082/133] Basic upload with chunks [WIP]

---
 .../ChunkFromFileChannelRequestEntity.java    |   8 +-
 .../network/ChunkFromFileRequestBody.java     | 100 ++++++++++++
 .../lib/common/network/FileRequestBody.java   |   4 +-
 .../ChunkedUploadRemoteFileOperation.java     | 145 ++++++++++--------
 4 files changed, 184 insertions(+), 73 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java

diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
index 8a88723b..f16be1ff 100644
--- a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
+++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
@@ -56,7 +56,7 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
     private final File mFile;
     private long mOffset;
     private long mTransferred;
-    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
+    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
     private ByteBuffer mBuffer = ByteBuffer.allocate(4096);
 
     public ChunkFromFileChannelRequestEntity(
@@ -120,8 +120,8 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
     
     
     public void writeRequest(final OutputStream out) throws IOException {
-        int readCount = 0;
-        Iterator<OnDatatransferProgressListener> it = null;
+        int readCount;
+        Iterator<OnDatatransferProgressListener> it;
 
         try {
             mChannel.position(mOffset);
@@ -161,7 +161,5 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
         } catch (FileRequestEntity.WriteException we) {
             throw we.getWrapped();
         }
-            
     }
-
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
new file mode 100644
index 00000000..2639217b
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
@@ -0,0 +1,100 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.network;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.util.Iterator;
+
+import okhttp3.MediaType;
+import okio.BufferedSink;
+
+public class ChunkFromFileRequestBody extends FileRequestBody {
+
+    private static final String TAG = ChunkFromFileChannelRequestEntity.class.getSimpleName();
+
+    //private final File mFile;
+    private final FileChannel mChannel;
+    private final long mChunkSize;
+    private long mOffset;
+    private long mTransferred;
+    private ByteBuffer mBuffer = ByteBuffer.allocate(4096);
+
+    public ChunkFromFileRequestBody(File file, MediaType contentType, FileChannel channel, long chunkSize) {
+        super(file, contentType);
+        if (channel == null) {
+            throw new IllegalArgumentException("File may not be null");
+        }
+        if (chunkSize <= 0) {
+            throw new IllegalArgumentException("Chunk size must be greater than zero");
+        }
+        this.mChannel = channel;
+        this.mChunkSize = chunkSize;
+        mOffset = 0;
+        mTransferred = 0;
+    }
+
+
+    @Override
+    public void writeTo(BufferedSink sink) {
+        int readCount;
+        Iterator<OnDatatransferProgressListener> it;
+
+        try {
+            mChannel.position(mOffset);
+            long size = mFile.length();
+            if (size == 0) size = -1;
+            long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
+            while (mChannel.position() < maxCount) {
+                readCount = mChannel.read(mBuffer);
+                sink.write(mBuffer.array(), 0 ,readCount);
+                mBuffer.clear();
+                if (mTransferred < maxCount) {  // condition to avoid accumulate progress for repeated chunks
+                    mTransferred += readCount;
+                }
+                synchronized (mDataTransferListeners) {
+                    it = mDataTransferListeners.iterator();
+                    while (it.hasNext()) {
+                        it.next().onTransferProgress(readCount, mTransferred, size, mFile.getAbsolutePath());
+                    }
+                }
+            }
+
+            sink.flush();
+
+        } catch (IOException io) {
+//            // any read problem will be handled as if the file is not there
+//            if (io instanceof FileNotFoundException) {
+//                throw io;
+//            } else {
+//                FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
+//                fnf.initCause(io);
+//                throw fnf;
+//            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
index 9c4b30ac..bec7f041 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestBody.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
@@ -43,7 +43,7 @@ import okio.Source;
  */
 public class FileRequestBody extends RequestBody implements ProgressiveDataTransferer {
 
-    private File mFile;
+    protected File mFile;
     private MediaType mContentType;
     Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
 
@@ -71,7 +71,7 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans
             long transferred = 0;
             long read;
 
-            while ((read = source.read(sink.buffer(), 2048)) != -1) {
+            while ((read = source.read(sink.buffer(), 4096)) != -1) {
                 transferred += read;
                 sink.flush();
                 synchronized (mDataTransferListeners) {
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 4ba4dedf..df454407 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,14 +26,28 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpUtils;
-import com.owncloud.android.lib.common.http.methods.webdav.MkColMethod;
-import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
+import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 
+import okhttp3.MediaType;
+
+import static com.owncloud.android.lib.common.http.HttpConstants.IF_MATCH_HEADER;
+import static com.owncloud.android.lib.common.http.HttpConstants.OC_TOTAL_LENGTH_HEADER;
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+
+/**
+ * Remote operation performing the chunked upload of a remote file to the ownCloud server.
+ *
+ * @author David A. Velasco
+ * @author David González Verdugo
+ */
 public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
 
     private static final int LAST_CHUNK_TIMEOUT = 900000; //15 mins.
@@ -46,11 +60,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 
     private long mTransferId;
 
-    public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType,
-                                            String fileLastModifTimestamp) {
-        super(storagePath, remotePath, mimeType, fileLastModifTimestamp);
-    }
-
     public ChunkedUploadRemoteFileOperation(long transferId, String storagePath, String remotePath, String mimeType,
                                             String requiredEtag, String fileLastModifTimestamp) {
         super(storagePath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
@@ -65,80 +74,84 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
         FileChannel channel = null;
         RandomAccessFile raf = null;
 
-        //TODO
-//        try {
-//            File file = new File(mLocalPath);
-//            raf = new RandomAccessFile(file, "r");
-//            channel = raf.getChannel();
-//            mEntity = new ChunkFromFileChannelRequestEntity(channel, mMimeType, CHUNK_SIZE, file);
-//            synchronized (mDataTransferListeners) {
-//                ((ProgressiveDataTransferer) mEntity)
-//                    .addDatatransferProgressListeners(mDataTransferListeners);
-//            }
-//
-//            long offset = 0;
-//            String uriPrefix = client.getOldWebdavUri() + WebdavUtils.encodePath(mRemotePath) +
-//                "-chunking-" + Math.abs((new Random()).nextInt(9000) + 1000) + "-";
-//            long totalLength = file.length();
-//            long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-//            String chunkSizeStr = String.valueOf(CHUNK_SIZE);
-//            String totalLengthStr = String.valueOf(file.length());
-//            for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
-//                if (chunkIndex == chunkCount - 1) {
-//                    chunkSizeStr = String.valueOf(CHUNK_SIZE * chunkCount - totalLength);
-//                }
-//                if (mPutMethod != null) {
-//                    mPutMethod.releaseConnection();     // let the connection available
-//                    // for other methods
-//                }
-//                mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex);
-//                if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-//                    mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
-//                }
+        try {
+            File fileToUpload = new File(mLocalPath);
+            MediaType mediaType = MediaType.parse(mMimeType);
+
+            raf = new RandomAccessFile(fileToUpload, "r");
+            channel = raf.getChannel();
+
+            mFileRequestBody = new ChunkFromFileRequestBody(fileToUpload, mediaType, channel, CHUNK_SIZE);
+
+            synchronized (mDataTransferListeners) {
+                mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
+            }
+
+            long offset = 0;
+            String uriPrefix = client.getNewUploadsWebDavUri() + FileUtils.PATH_SEPARATOR + String.valueOf(mTransferId);
+            long totalLength = fileToUpload.length();
+            long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
+            String chunkSizeStr = String.valueOf(CHUNK_SIZE);
+            String totalLengthStr = String.valueOf(fileToUpload.length());
+
+            for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
+                if (chunkIndex == chunkCount - 1) {
+                    chunkSizeStr = String.valueOf(CHUNK_SIZE * chunkCount - totalLength);
+                }
+
+                mPutMethod = new PutMethod(
+                        HttpUtils.stringUrlToHttpUrl(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
+                );
+
+                if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
+                    mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
+                }
 //                mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
 //                mPutMethod.addRequestHeader(OC_CHUNK_SIZE_HEADER, chunkSizeStr);
-//                mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
-//
-//                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-//
+                mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
+
+                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+
 //                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
 //                mPutMethod.setRequestEntity(mEntity);
 //                if (mCancellationRequested.get()) {
 //                    mPutMethod.abort();
 //                    // next method will throw an exception
 //                }
-//
+
 //                if (chunkIndex == chunkCount - 1) {
 //                    // Added a high timeout to the last chunk due to when the last chunk
 //                    // arrives to the server with the last PUT, all chunks get assembled
 //                    // within that PHP request, so last one takes longer.
 //                    mPutMethod.getParams().setSoTimeout(LAST_CHUNK_TIMEOUT);
 //                }
-//
-//                status = client.executeMethod(mPutMethod);
-//
-//                result = new RemoteOperationResult(
-//                    isSuccess(status),
-//                    mPutMethod
-//                );
-//
-//                client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
-//                Log_OC.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath +
-//                    ", chunk index " + chunkIndex + ", count " + chunkCount +
-//                    ", HTTP result status " + status);
-//
-//                if (!isSuccess(status))
-//                    break;
-//            }
-//
-//        } finally {
-//            if (channel != null)
-//                channel.close();
-//            if (raf != null)
-//                raf.close();
+
+                mPutMethod.setRequestBody(mFileRequestBody);
+
+                status = client.executeHttpMethod(mPutMethod);
+
+                Log_OC.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath +
+                        ", chunk index " + chunkIndex + ", count " + chunkCount +
+                        ", HTTP result status " + status);
+
+                if (isSuccess(status)) {
+                    result = new RemoteOperationResult(OK);
+                } else {
+                    result = new RemoteOperationResult(mPutMethod);
+                    break;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (channel != null)
+                channel.close();
+            if (raf != null)
+                raf.close();
 //            if (mPutMethod != null)
 //                mPutMethod.releaseConnection();    // let the connection available for other methods
-//        }
+        }
         return result;
     }
 }
\ No newline at end of file

From 75905b5f747c1ab803d1fa6d5c2f3b7d39bbeeb5 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Tue, 26 Jun 2018 18:26:31 +0200
Subject: [PATCH 083/133] add disable redict handling by davresource

---
 dav4android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dav4android b/dav4android
index 922b22b4..b20c44c6 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 922b22b4e1f40d72d54f5f47db02cd962f46acab
+Subproject commit b20c44c63f45355599d4bfaf00042964b9e6cafa

From 6e4ded84d92d5a8f374c97904e68b83f842ecdb0 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 27 Jun 2018 14:25:41 +0200
Subject: [PATCH 084/133] make OwnCloudClient extend the warpper HttpClient

---
 .../android/lib/common/OwnCloudClient.java    | 347 ++++--------------
 .../lib/common/OwnCloudClientFactory.java     |   2 +-
 .../lib/common/SingleSessionManager.java      |   1 -
 .../lib/common/accounts/AccountUtils.java     |  30 +-
 .../OwnCloudBasicCredentials.java             |   6 -
 .../OwnCloudBearerCredentials.java            |  11 -
 .../OwnCloudCredentialsFactory.java           |  19 +-
 .../OwnCloudSamlSsoCredentials.java           |   4 -
 .../android/lib/common/http/HttpClient.java   |  24 +-
 .../common/http/methods/HttpBaseMethod.java   | 126 ++++---
 10 files changed, 196 insertions(+), 374 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index c4bc58e7..46b339d0 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -25,6 +25,7 @@
 
 package com.owncloud.android.lib.common;
 
+import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.content.Context;
@@ -33,26 +34,23 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
+import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.URI;
-import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.httpclient.params.HttpParams;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Cookie;
+import okhttp3.Headers;
+import okhttp3.HttpUrl;
 
 public class OwnCloudClient extends HttpClient {
 
@@ -90,53 +88,11 @@ public class OwnCloudClient extends HttpClient {
      */
     private OwnCloudClientManager mOwnCloudClientManager = null;
 
-    /**
-     * When 'true', the method {@link #executeMethod(HttpMethod)}  tries to silently refresh credentials
-     * if fails due to lack of authorization, if credentials support authorization refresh.
-     */
-    private boolean mSilentRefreshOfAccountCredentials = true;
-
     private String mRedirectedLocation;
     private boolean mFollowRedirects;
 
-    /**
-     * Constructor
-     */
-
-//    public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr) {
-//
-//        super(connectionMgr);
-//
-//        if (baseUri == null) {
-//            throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
-//        }
-//        mBaseUri = baseUri;
-//
-//        mInstanceNumber = sIntanceCounter++;
-//        Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
-//
-//        String userAgent = OwnCloudClientManagerFactory.getUserAgent();
-//        getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
-//        getParams().setParameter(
-//                PARAM_PROTOCOL_VERSION,
-//                HttpVersion.HTTP_1_1
-//        );
-//
-//        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
-//        getParams().setParameter(
-//                PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
-//                PARAM_SINGLE_COOKIE_HEADER_VALUE
-//        );
-//
-//        applyProxySettings();
-//
-//        clearCredentials();
-//    }
-
-    public OwnCloudClient(Uri baseUri, HttpConnectionManager connectionMgr) {
-
-        super(connectionMgr);
 
+    public OwnCloudClient(Uri baseUri) {
         if (baseUri == null) {
             throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
         }
@@ -157,25 +113,6 @@ public class OwnCloudClient extends HttpClient {
         clearCredentials();
     }
 
-    private void applyProxySettings() {
-        String proxyHost = System.getProperty("http.proxyHost");
-        String proxyPortSt = System.getProperty("http.proxyPort");
-        int proxyPort = 0;
-        try {
-            if (proxyPortSt != null && proxyPortSt.length() > 0) {
-                proxyPort = Integer.parseInt(proxyPortSt);
-            }
-        } catch (Exception e) {
-            Log_OC.w(TAG, "Proxy port could not be read, keeping default value " + proxyPort);
-        }
-
-        if (proxyHost != null && proxyHost.length() > 0) {
-            HostConfiguration hostCfg = getHostConfiguration();
-            hostCfg.setProxy(proxyHost, proxyPort);
-            Log_OC.d(TAG, "Proxy settings: " + proxyHost + ":" + proxyPort);
-        }
-    }
-
     public void setCredentials(OwnCloudCredentials credentials) {
         if (credentials != null) {
             mCredentials = credentials;
@@ -192,91 +129,6 @@ public class OwnCloudClient extends HttpClient {
         mCredentials.applyTo(this);
     }
 
-    /**
-     * Requests the received method with the received timeout (milliseconds).
-     *
-     * Executes the method through the inherited HttpClient.executedMethod(method).
-     *
-     * Sets the socket and connection timeouts only for the method received.
-     *
-     * The timeouts are both in milliseconds; 0 means 'infinite';
-     * < 0 means 'do not change the default'
-     *
-     * @param method            HTTP method request.
-     * @param readTimeout       Timeout to set for data reception
-     * @param connectionTimeout Timeout to set for connection establishment
-     */
-    public int executeMethod(HttpMethodBase method, int readTimeout, int connectionTimeout) throws IOException {
-
-        int oldSoTimeout = getParams().getSoTimeout();
-        int oldConnectionTimeout = getHttpConnectionManager().getParams().getConnectionTimeout();
-        try {
-            if (readTimeout >= 0) {
-                method.getParams().setSoTimeout(readTimeout);   // this should be enough...
-                getParams().setSoTimeout(readTimeout);          // ... but HTTPS needs this
-            }
-            if (connectionTimeout >= 0) {
-                getHttpConnectionManager().getParams().setConnectionTimeout(connectionTimeout);
-            }
-            return executeMethod(method);
-        } finally {
-            getParams().setSoTimeout(oldSoTimeout);
-            getHttpConnectionManager().getParams().setConnectionTimeout(oldConnectionTimeout);
-        }
-    }
-
-    /**
-     * Requests the received method.
-     *
-     * Executes the method through the inherited HttpClient.executedMethod(method).
-     *
-     * @param method HTTP method request.
-     */
-    @Override
-    public int executeMethod(HttpMethod method) throws IOException {
-
-        boolean repeatWithFreshCredentials;
-        int repeatCounter = 0;
-        int status;
-
-        do {
-            // Update User Agent
-            HttpParams params = method.getParams();
-            String userAgent = OwnCloudClientManagerFactory.getUserAgent();
-            params.setParameter(HttpMethodParams.USER_AGENT, userAgent);
-
-            preventCrashDueToInvalidPort(method);
-
-            Log_OC.d(TAG + " #" + mInstanceNumber, "REQUEST " +
-                    method.getName() + " " + method.getPath());
-
-            //logCookiesAtRequest(method.getRequestHeaders(), "before");
-            //logCookiesAtState("before");
-            method.setFollowRedirects(false);
-
-            status = super.executeMethod(method);
-
-            checkFirstRedirection(method);
-
-            // TODO
-//            if (mOkHttpClient.followRedirects()) {
-//                status = followRedirection(method).getLastStatus();
-//            }
-
-            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
-            if (repeatWithFreshCredentials) {
-                repeatCounter++;
-            }
-
-        } while (repeatWithFreshCredentials);
-
-        //logCookiesAtRequest(method.getRequestHeaders(), "after");
-        //logCookiesAtState("after");
-        //logSetCookiesAtResponse(method.getResponseHeaders());
-
-        return status;
-    }
-
     public int executeHttpMethod (HttpBaseMethod method) throws Exception {
 
         boolean repeatWithFreshCredentials;
@@ -297,14 +149,11 @@ public class OwnCloudClient extends HttpClient {
     }
 
     private void checkFirstRedirection(HttpMethod method) {
-        Header[] httpHeaders = method.getResponseHeaders();
+        final String location = method.getResponseHeaders()
+                .get("location");
 
-        for (Header httpHeader : httpHeaders) {
-
-            if ("location".equals(httpHeader.getName().toLowerCase())) {
-                mRedirectedLocation = httpHeader.getValue();
-                break;
-            }
+        if(location != null && !location.isEmpty()) {
+            mRedirectedLocation = location;
         }
     }
 
@@ -322,11 +171,10 @@ public class OwnCloudClient extends HttpClient {
      *
      * @param method HTTP method to run.
      * @throws IllegalArgumentException If 'method' targets an invalid port in an HTTP URI.
-     * @throws URIException             If the URI to the target server cannot be built.
      */
-    private void preventCrashDueToInvalidPort(HttpMethod method) throws URIException {
-        int port = method.getURI().getPort();
-        String scheme = method.getURI().getScheme().toLowerCase();
+    private void preventCrashDueToInvalidPort(HttpMethod method) {
+        final int port = method.getUrl().port();
+        String scheme = method.getUrl().scheme().toLowerCase();
         if ("http".equals(scheme) && port > 0xFFFF) {
             // < 0 is not tested because -1 is used when no port number is specified in the URL;
             // no problem, the network library will convert that in the default HTTP port
@@ -334,57 +182,52 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-    public RedirectionPath followRedirection(HttpMethod method) throws IOException {
+    public RedirectionPath followRedirection(HttpMethod method) throws Exception {
         int redirectionsCount = 0;
         int status = method.getStatusCode();
         RedirectionPath result = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
 
         while (redirectionsCount < MAX_REDIRECTIONS_COUNT &&
-                (status == HttpStatus.SC_MOVED_PERMANENTLY ||
-                        status == HttpStatus.SC_MOVED_TEMPORARILY ||
-                        status == HttpStatus.SC_TEMPORARY_REDIRECT)
+                (status == HttpConstants.HTTP_MOVED_PERMANENTLY ||
+                        status == HttpConstants.HTTP_MOVED_TEMPORARILY ||
+                        status == HttpConstants.HTTP_TEMPORARY_REDIRECT)
                 ) {
 
-            Header location = method.getResponseHeader("Location");
-            if (location == null) {
-                location = method.getResponseHeader("location");
-            }
+            final String location = method.getResponseHeader("Location") != null
+                    ? method.getResponseHeader("Location")
+                    : method.getResponseHeader("location");
             if (location != null) {
-                String locationStr = location.getValue();
 
                 Log_OC.d(TAG + " #" + mInstanceNumber,
-                        "Location to redirect: " + locationStr);
+                        "Location to redirect: " + location);
 
-                result.addLocation(locationStr);
+                result.addLocation(location);
 
                 // Release the connection to avoid reach the max number of connections per host
                 // due to it will be set a different url
-                exhaustResponse(method.getResponseBodyAsStream());
-                method.releaseConnection();
+                exhaustResponse(method.getResponseAsStream());
+
+                method.setUrl(HttpUrl.parse(location));
+                final String destination = method.getRequestHeader("Destination") != null
+                        ? method.getRequestHeader("Destination")
+                        : method.getRequestHeader("destination");
 
-                method.setURI(new URI(locationStr, true));
-                Header destination = method.getRequestHeader("Destination");
-                if (destination == null) {
-                    destination = method.getRequestHeader("destination");
-                }
                 if (destination != null) {
-                    int suffixIndex = locationStr.lastIndexOf(WEBDAV_PATH_4_0);
-                    String redirectionBase = locationStr.substring(0, suffixIndex);
+                    final int suffixIndex = location.lastIndexOf(WEBDAV_PATH_4_0);
+                    final String redirectionBase = location.substring(0, suffixIndex);
 
-                    String destinationStr = destination.getValue();
-                    String destinationPath = destinationStr.substring(mBaseUri.toString().length());
-                    String redirectedDestination = redirectionBase + destinationPath;
+                    final String destinationPath = destination.substring(mBaseUri.toString().length());
+                    final String redirectedDestination = redirectionBase + destinationPath;
 
-                    destination.setValue(redirectedDestination);
-                    method.setRequestHeader(destination);
+                    method.setRequestHeader("destination", destination);
                 }
-                status = super.executeMethod(method);
+                status = executeHttpMethod(method);
                 result.addStatus(status);
                 redirectionsCount++;
 
             } else {
                 Log_OC.d(TAG + " #" + mInstanceNumber, "No location to redirect!");
-                status = HttpStatus.SC_NOT_FOUND;
+                status = HttpConstants.HTTP_NOT_FOUND;
             }
         }
         return result;
@@ -408,19 +251,6 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-    /**
-     * Sets the connection and wait-for-data timeouts to be applied by default to the methods
-     * performed by this client.
-     */
-    public void setDefaultTimeouts(int defaultDataTimeout, int defaultConnectionTimeout) {
-        if (defaultDataTimeout >= 0) {
-            getParams().setSoTimeout(defaultDataTimeout);
-        }
-        if (defaultConnectionTimeout >= 0) {
-            getHttpConnectionManager().getParams().setConnectionTimeout(defaultConnectionTimeout);
-        }
-    }
-
     public Uri getOldFilesWebdavUri() {
         return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
     }
@@ -459,81 +289,56 @@ public class OwnCloudClient extends HttpClient {
         return mCredentials;
     }
 
-    private void logCookiesAtRequest(Header[] headers, String when) {
+    private void logCookiesAtRequest(Headers headers, String when) {
         int counter = 0;
-        for (int i = 0; i < headers.length; i++) {
-            if (headers[i].getName().toLowerCase().equals("cookie")) {
-                Log_OC.d(TAG + " #" + mInstanceNumber,
-                        "Cookies at request (" + when + ") (" + counter++ + "): " +
-                                headers[i].getValue());
-            }
+        for (final String cookieHeader : headers.toMultimap().get("cookie")) {
+            Log_OC.d(TAG + " #" + mInstanceNumber,
+                    "Cookies at request (" + when + ") (" + counter++ + "): "
+                            + cookieHeader);
         }
         if (counter == 0) {
             Log_OC.d(TAG + " #" + mInstanceNumber, "No cookie at request before");
         }
     }
 
-    private void logCookiesAtState(String string) {
-        Cookie[] cookies = getState().getCookies();
-        if (cookies.length == 0) {
-            Log_OC.d(TAG + " #" + mInstanceNumber, "No cookie at STATE before");
-        } else {
-            Log_OC.d(TAG + " #" + mInstanceNumber, "Cookies at STATE (before)");
-            for (int i = 0; i < cookies.length; i++) {
-                Log_OC.d(TAG + " #" + mInstanceNumber, "    (" + i + "):" +
-                        "\n        name: " + cookies[i].getName() +
-                        "\n        value: " + cookies[i].getValue() +
-                        "\n        domain: " + cookies[i].getDomain() +
-                        "\n        path: " + cookies[i].getPath()
-                );
-            }
-        }
-    }
-
-    private void logSetCookiesAtResponse(Header[] headers) {
+    private void logSetCookiesAtResponse(Headers headers) {
         int counter = 0;
-        for (int i = 0; i < headers.length; i++) {
-            if (headers[i].getName().toLowerCase().equals("set-cookie")) {
-                Log_OC.d(TAG + " #" + mInstanceNumber,
-                        "Set-Cookie (" + counter++ + "): " + headers[i].getValue());
-            }
+        for (final String cookieHeader : headers.toMultimap().get("set-cookie")) {
+            Log_OC.d(TAG + " #" + mInstanceNumber,
+                    "Set-Cookie (" + counter++ + "): " + cookieHeader);
         }
         if (counter == 0) {
             Log_OC.d(TAG + " #" + mInstanceNumber, "No set-cookie");
         }
     }
 
-    public String getCookiesString() {
-        Cookie[] cookies = getState().getCookies();
-        String cookiesString = "";
-        for (Cookie cookie : cookies) {
-            cookiesString = cookiesString + cookie.toString() + ";";
+    public List<Cookie> getCookiesFromCurrentAccount() {
+        return getOkHttpClient().cookieJar().loadForRequest(HttpUrl.parse(
+                getAccount().getBaseUri().toString()));
+    }
 
-            // logCookie(cookie);
+    public String getCookiesString() {
+
+        String cookiesString = "";
+        for (Cookie cookie : getCookiesFromCurrentAccount()) {
+            cookiesString += cookie.toString() + ";";
         }
 
         return cookiesString;
-
     }
 
-    public int getConnectionTimeout() {
-        return getHttpConnectionManager().getParams().getConnectionTimeout();
-    }
-
-    public int getDataTimeout() {
-        return getParams().getSoTimeout();
+    public void setCookiesForCurrentAccount(List<Cookie> cookies) {
+        getOkHttpClient().cookieJar().saveFromResponse(HttpUrl.parse(
+                getAccount().getBaseUri().toString()), cookies);
     }
 
     private void logCookie(Cookie cookie) {
-        Log_OC.d(TAG, "Cookie name: " + cookie.getName());
-        Log_OC.d(TAG, "       value: " + cookie.getValue());
-        Log_OC.d(TAG, "       domain: " + cookie.getDomain());
-        Log_OC.d(TAG, "       path: " + cookie.getPath());
-        Log_OC.d(TAG, "       version: " + cookie.getVersion());
-        Log_OC.d(TAG, "       expiryDate: " +
-                (cookie.getExpiryDate() != null ? cookie.getExpiryDate().toString() : "--"));
-        Log_OC.d(TAG, "       comment: " + cookie.getComment());
-        Log_OC.d(TAG, "       secure: " + cookie.getSecure());
+        Log_OC.d(TAG, "Cookie name: " + cookie.name());
+        Log_OC.d(TAG, "       value: " + cookie.value());
+        Log_OC.d(TAG, "       domain: " + cookie.domain());
+        Log_OC.d(TAG, "       path: " + cookie.path());
+        Log_OC.d(TAG, "       expiryDate: " + cookie.expiresAt());
+        Log_OC.d(TAG, "       secure: " + cookie.secure());
     }
 
 
@@ -545,10 +350,6 @@ public class OwnCloudClient extends HttpClient {
         return mVersion;
     }
 
-    public void setContext(Context context) {
-        this.mContext = context;
-    }
-
     public Context getContext() {
         return mContext;
     }
@@ -561,18 +362,6 @@ public class OwnCloudClient extends HttpClient {
         return mAccount;
     }
 
-    /**
-     * Enables or disables silent refresh of credentials, if supported by credentials themselves.
-     */
-    public void setSilentRefreshOfAccountCredentials(boolean silentRefreshOfAccountCredentials) {
-        mSilentRefreshOfAccountCredentials = silentRefreshOfAccountCredentials;
-    }
-
-    public boolean getSilentRefreshOfAccountCredentials() {
-        return mSilentRefreshOfAccountCredentials;
-    }
-
-
     /**
      * Checks the status code of an execution and decides if should be repeated with fresh credentials.
      *
@@ -632,7 +421,7 @@ public class OwnCloudClient extends HttpClient {
      */
     private boolean shouldInvalidateAccountCredentials(int httpStatusCode) {
 
-        boolean should = (httpStatusCode == HttpStatus.SC_UNAUTHORIZED || isIdPRedirection());   // invalid credentials
+        boolean should = (httpStatusCode == HttpConstants.HTTP_UNAUTHORIZED || isIdPRedirection());   // invalid credentials
 
         should &= (mCredentials != null &&         // real credentials
                 !(mCredentials instanceof OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials));
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 6ba54983..33ded0e5 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -173,7 +173,7 @@ public class OwnCloudClientFactory {
                     " in the system will be used for HTTPS connections", e);
         }
         
-        OwnCloudClient client = new OwnCloudClient(uri, NetworkUtils.getMultiThreadedConnManager());
+        OwnCloudClient client = new OwnCloudClient(uri);
 
         client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
 
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index ae422550..993fbd85 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -115,7 +115,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
                 account.getBaseUri(),
                 context.getApplicationContext(),
                 true);    // TODO remove dependency on OwnCloudClientFactory
-            client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
             client.setAccount(account);
             client.setContext(context);
             client.setOwnCloudClientManager(this);
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index 4b2df189..a1499481 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -26,8 +26,8 @@
 package com.owncloud.android.lib.common.accounts;
 
 import java.io.IOException;
-
-import org.apache.commons.httpclient.Cookie;
+import java.util.ArrayList;
+import java.util.List;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -43,6 +43,8 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import okhttp3.Cookie;
+
 public class AccountUtils {
 
     private static final String TAG = AccountUtils.class.getSimpleName();
@@ -217,7 +219,6 @@ public class AccountUtils {
 
     }
 
-
     /**
      * Restore the client cookies persisted in an account stored in the system AccountManager.
      *
@@ -239,19 +240,18 @@ public class AccountUtils {
 
             String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
             if (cookiesString != null) {
-                String[] cookies = cookiesString.split(";");
-                if (cookies.length > 0) {
-                    for (int i = 0; i < cookies.length; i++) {
-                        Cookie cookie = new Cookie();
-                        int equalPos = cookies[i].indexOf('=');
-                        cookie.setName(cookies[i].substring(0, equalPos));
-                        cookie.setValue(cookies[i].substring(equalPos + 1));
-                        cookie.setDomain(serverUri.getHost());    // VERY IMPORTANT
-                        cookie.setPath(serverUri.getPath());    // VERY IMPORTANT
-
-                        client.getState().addCookie(cookie);
-                    }
+                String[] rawCookies = cookiesString.split(";");
+                List<Cookie> cookieList = new ArrayList<>(rawCookies.length);
+                for(String rawCookie : rawCookies) {
+                    final int equalPos = rawCookie.indexOf('=');
+                    cookieList.add(new Cookie.Builder()
+                            .name(rawCookie.substring(0, equalPos))
+                            .value(rawCookie.substring(equalPos + 1))
+                            .domain(serverUri.getHost())
+                            .path(serverUri.getPath())
+                            .build());
                 }
+                client.setCookiesForCurrentAccount(cookieList);
             }
         }
     }
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 39e67b99..d7be9cec 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -82,12 +82,6 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
                 .addRequestInterceptor(
                         new BasicAuthInterceptor(mUsername, mPassword)
                 );
-
-        //TODO Update from here down
-        client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
-        client.getParams().setAuthenticationPreemptive(mAuthenticationPreemptive);
-        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
-        client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(mUsername, mPassword));
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
index 6b3e1614..c22a0ae7 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
@@ -70,17 +70,6 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
         HttpClient.getOkHttpInterceptor()
                 .addRequestInterceptor(new BarearAuthInterceptor(mAccessToken));
-
-        List<String> authPrefs = new ArrayList<>(1);
-        authPrefs.add(BearerAuthScheme.AUTH_POLICY);
-        client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
-
-        client.getParams().setAuthenticationPreemptive(true);    // true enforces BASIC AUTH ; library is stupid
-        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
-        client.getState().setCredentials(
-            AuthScope.ANY,
-            new BearerCredentials(mAccessToken)
-        );
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
index 8643aaea..f22e06d8 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
@@ -25,6 +25,13 @@
 package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
+
+import java.util.ArrayList;
 
 public class OwnCloudCredentialsFactory {
 
@@ -64,8 +71,16 @@ public class OwnCloudCredentialsFactory {
 
         @Override
         public void applyTo(OwnCloudClient client) {
-            client.getState().clearCredentials();
-            client.getState().clearCookies();
+            ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors = HttpClient.getOkHttpInterceptor().getRequestInterceptors();
+
+            // Clear previous basic credentials
+            for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
+                if (requestInterceptor instanceof BasicAuthInterceptor
+                        || requestInterceptor instanceof BarearAuthInterceptor
+                        || requestInterceptor instanceof SamlAuthInterceptor) {
+                    requestInterceptors.remove(requestInterceptor);
+                }
+            }
         }
 
         @Override
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 0828b7c7..69c88316 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -50,10 +50,6 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 
     @Override
     public void applyTo(OwnCloudClient client) {
-        client.getParams().setAuthenticationPreemptive(false);
-        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
-        client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
-
         final ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors =
                 HttpClient.getOkHttpInterceptor().getRequestInterceptors();
 
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index d7467ce7..df4c52b2 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
+import java.util.concurrent.TimeUnit;
 
 import com.facebook.stetho.okhttp3.StethoInterceptor;
 import com.owncloud.android.lib.BuildConfig;
@@ -39,9 +40,7 @@ import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 
 import java.util.Arrays;
 
-import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
@@ -59,6 +58,10 @@ public class HttpClient {
     private static HttpInterceptor sOkHttpInterceptor;
     private static Context sContext;
 
+    public HttpClient() {
+
+    }
+
     public static void setContext(Context context) {
         sContext = context;
     }
@@ -99,4 +102,21 @@ public class HttpClient {
         }
         return sOkHttpInterceptor;
     }
+
+    /**
+     * Sets the connection and wait-for-data timeouts to be applied by default to the methods
+     * performed by this client.
+     */
+    public void setDefaultTimeouts(int defaultDataTimeout, int defaultConnectionTimeout) {
+        OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
+        if (defaultDataTimeout >= 0) {
+            clientBuilder
+                    .readTimeout(defaultDataTimeout, TimeUnit.MILLISECONDS)
+                    .writeTimeout(defaultDataTimeout, TimeUnit.MILLISECONDS);
+        }
+        if (defaultConnectionTimeout >= 0) {
+            clientBuilder.connectTimeout(defaultConnectionTimeout, TimeUnit.MILLISECONDS);
+        }
+        sOkHttpClient = clientBuilder.build();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 811194bf..00ac6d6f 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -60,59 +60,19 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
-    // Connection parameters
-    public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .readTimeout(readTimeout, timeUnit)
-                .build();
+
+
+    public void abort() {
+        mCall.cancel();
     }
 
-    public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .readTimeout(connectionTimeout, timeUnit)
-                .build();
+    public boolean isAborted() {
+        return mCall.isCanceled();
     }
 
-    public void setFollowRedirects(boolean followRedirects) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .followRedirects(followRedirects)
-                .build();
-    }
-
-    public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
-        mOkHttpClient = mOkHttpClient.newBuilder()
-                .retryOnConnectionFailure(retryOnConnectionFailure)
-                .build();
-    }
-
-    public boolean getRetryOnConnectionFailure() {
-        return mOkHttpClient.retryOnConnectionFailure();
-    }
-
-    // Request
-    public String getRequestHeader(String name) {
-        return mRequest.header(name);
-    }
-
-    public Headers getRequestHeaders() {
-        return mRequest.headers();
-    }
-
-    public void addRequestHeader(String name, String value) {
-        mRequest = mRequest.newBuilder()
-                .addHeader(name, value)
-                .build();
-    }
-
-    public void setRequestHeader(String name, String value) {
-        mRequest = mRequest.newBuilder()
-                .header(name, value)
-                .build();
-    }
-
-    public void setRequestBody(RequestBody requestBody) {
-        mRequestBody = requestBody;
-    }
+    //////////////////////////////
+    //         Getter
+    //////////////////////////////
 
     // Response
     public int getStatusCode() {
@@ -139,11 +99,71 @@ public abstract class HttpBaseMethod {
         return mResponse.header(headerName);
     }
 
-    public void abort() {
-        mCall.cancel();
+    public HttpUrl getUrl() {
+        return mRequest.url();
     }
 
-    public boolean isAborted() {
-        return mCall.isCanceled();
+    public boolean getRetryOnConnectionFailure() {
+        return mOkHttpClient.retryOnConnectionFailure();
+    }
+
+    // Request
+    public String getRequestHeader(String name) {
+        return mRequest.header(name);
+    }
+
+    public Headers getRequestHeaders() {
+        return mRequest.headers();
+    }
+
+    //////////////////////////////
+    //         Setter
+    //////////////////////////////
+
+    // Connection parameters
+    public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .readTimeout(readTimeout, timeUnit)
+                .build();
+    }
+
+    public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .readTimeout(connectionTimeout, timeUnit)
+                .build();
+    }
+
+    public void setFollowRedirects(boolean followRedirects) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .followRedirects(followRedirects)
+                .build();
+    }
+
+    public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
+        mOkHttpClient = mOkHttpClient.newBuilder()
+                .retryOnConnectionFailure(retryOnConnectionFailure)
+                .build();
+    }
+
+    public void addRequestHeader(String name, String value) {
+        mRequest = mRequest.newBuilder()
+                .addHeader(name, value)
+                .build();
+    }
+
+    public void setRequestHeader(String name, String value) {
+        mRequest = mRequest.newBuilder()
+                .header(name, value)
+                .build();
+    }
+
+    public void setRequestBody(RequestBody requestBody) {
+        mRequestBody = requestBody;
+    }
+
+    public void setUrl(HttpUrl url) {
+        mRequest = mRequest.newBuilder()
+                .url(url)
+                .build();
     }
 }
\ No newline at end of file

From 0d0b711556551e3fd7fef04329616d779bec699b Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 27 Jun 2018 17:16:07 +0200
Subject: [PATCH 085/133] remove apache httpclient imports

---
 .../lib/common/OwnCloudClientFactory.java     |  11 -
 .../lib/common/SingleSessionManager.java      |   2 +-
 .../OwnCloudBasicCredentials.java             |  15 +-
 .../OwnCloudBearerCredentials.java            |  10 -
 .../OwnCloudSamlSsoCredentials.java           |   2 +-
 .../oauth/BearerAuthScheme.java               | 262 -------------
 .../oauth/BearerCredentials.java              |  13 +-
 .../lib/common/http/HttpConstants.java        |   4 +
 .../network/AdvancedSslSocketFactory.java     | 344 ------------------
 .../ChunkFromFileChannelRequestEntity.java    |   4 +-
 .../lib/common/network/FileRequestEntity.java |  74 +---
 .../lib/common/network/NetworkUtils.java      |  74 +---
 .../lib/common/network/RedirectionPath.java   |   6 +-
 .../operations/RemoteOperationResult.java     | 130 +------
 .../status/GetRemoteStatusOperation.java      |   2 +-
 .../users/GetRemoteUserAvatarOperation.java   |   4 +-
 .../SelfSignedConfidentSslSocketFactory.java  |   6 -
 .../lib/test_project/TestActivity.java        |   4 +-
 .../lib/test_project/test/CopyFileTest.java   |   8 +-
 .../test/GetCapabilitiesTest.java             |   4 +-
 .../lib/test_project/test/GetShareesTest.java |  14 +-
 .../test_project/test/GetUserAvatarTest.java  |   4 +-
 .../lib/test_project/test/MoveFileTest.java   |   8 +-
 .../test_project/test/OwnCloudClientTest.java |  14 +-
 .../test/SimpleFactoryManagerTest.java        |   4 +-
 .../test/SingleSessionManagerTest.java        |   4 +-
 .../test/UpdatePrivateShareTest.java          |   4 +-
 .../test/UpdatePublicShareTest.java           |   4 +-
 28 files changed, 83 insertions(+), 952 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/common/authentication/oauth/BearerAuthScheme.java
 delete mode 100644 src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 33ded0e5..a77568f5 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -162,17 +162,6 @@ public class OwnCloudClientFactory {
      * @return          A OwnCloudClient object ready to be used
      */
     public static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
-        try {
-            NetworkUtils.registerAdvancedSslContext(true, context);
-        }  catch (GeneralSecurityException e) {
-            Log_OC.e(TAG, "Advanced SSL Context could not be loaded. Default SSL management in" +
-                    " the system will be used for HTTPS connections", e);
-            
-        } catch (IOException e) {
-            Log_OC.e(TAG, "The local server truststore could not be read. Default SSL management" +
-                    " in the system will be used for HTTPS connections", e);
-        }
-        
         OwnCloudClient client = new OwnCloudClient(uri);
 
         client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 993fbd85..911ac59d 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.httpclient.cookie.CookiePolicy;
+
 
 import android.accounts.Account;
 import android.accounts.AuthenticatorException;
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index d7be9cec..8fce943d 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -31,11 +31,11 @@ import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
 
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthPolicy;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.auth.AuthState;
-import org.apache.commons.httpclient.auth.BasicScheme;
+
+
+
+
+
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,11 +62,6 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
     @Override
     public void applyTo(OwnCloudClient client) {
-        AuthPolicy.registerAuthScheme(AuthState.PREEMPTIVE_AUTH_SCHEME, BasicScheme.class);
-
-        List<String> authPrefs = new ArrayList<>(1);
-        authPrefs.add(AuthPolicy.BASIC);
-
         ArrayList<RequestInterceptor> requestInterceptors = HttpClient.getOkHttpInterceptor().getRequestInterceptors();
 
         // Clear previous basic credentials
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
index c22a0ae7..2f44f12e 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
@@ -23,18 +23,10 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-import android.app.DownloadManager;
-
 import java.util.ArrayList;
-import java.util.List;
 
-import org.apache.commons.httpclient.auth.AuthPolicy;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.auth.AuthState;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.authentication.oauth.BearerAuthScheme;
-import com.owncloud.android.lib.common.authentication.oauth.BearerCredentials;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
@@ -53,8 +45,6 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
     @Override
     public void applyTo(OwnCloudClient client) {
-        AuthPolicy.registerAuthScheme(BearerAuthScheme.AUTH_POLICY, BearerAuthScheme.class);
-        AuthPolicy.registerAuthScheme(AuthState.PREEMPTIVE_AUTH_SCHEME, BearerAuthScheme.class);
 
         final ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors =
                 HttpClient.getOkHttpInterceptor().getRequestInterceptors();
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 69c88316..40d4c785 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -23,7 +23,7 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-import org.apache.commons.httpclient.cookie.CookiePolicy;
+
 
 import android.net.Uri;
 
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/BearerAuthScheme.java b/src/com/owncloud/android/lib/common/authentication/oauth/BearerAuthScheme.java
deleted file mode 100644
index b0104342..00000000
--- a/src/com/owncloud/android/lib/common/authentication/oauth/BearerAuthScheme.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.authentication.oauth;
-
-import java.util.Map;
-
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.auth.AuthChallengeParser;
-import org.apache.commons.httpclient.auth.AuthScheme;
-import org.apache.commons.httpclient.auth.AuthenticationException;
-import org.apache.commons.httpclient.auth.InvalidCredentialsException;
-import org.apache.commons.httpclient.auth.MalformedChallengeException;
-
-
-
-/**
- * Bearer authentication scheme as defined in RFC 6750.
- * 
- * @author David A. Velasco
- */
-
-public class BearerAuthScheme implements AuthScheme /*extends RFC2617Scheme*/ {
-    
-    private static final String TAG = BearerAuthScheme.class.getSimpleName();
-
-    public static final String AUTH_POLICY = "Bearer";
-    
-    /** Whether the bearer authentication process is complete */
-    private boolean mComplete;
-    
-    /** Authentication parameter map */
-    @SuppressWarnings("rawtypes")
-	private Map mParams = null;
-    
-    
-    /**
-     * Default constructor for the bearer authentication scheme.
-     */
-    public BearerAuthScheme() {
-        mComplete = false;
-    }
-
-    /**
-     * Constructor for the basic authentication scheme.
-     * 
-     * @param   challenge                       Authentication challenge
-     * 
-     * @throws  MalformedChallengeException     Thrown if the authentication challenge is malformed
-     */
-    public BearerAuthScheme(final String challenge) throws MalformedChallengeException {
-        processChallenge(challenge);
-        mComplete = true;
-    }
-
-    /**
-     * Returns textual designation of the bearer authentication scheme.
-     * 
-     * @return "Bearer"
-     */
-    public String getSchemeName() {
-        return "bearer";
-    }
-
-    /**
-     * Processes the Bearer challenge.
-     *  
-     * @param   challenge                   The challenge string
-     * 
-     * @throws MalformedChallengeException  Thrown if the authentication challenge is malformed
-     */
-    public void processChallenge(String challenge) throws MalformedChallengeException {
-        String s = AuthChallengeParser.extractScheme(challenge);
-        if (!s.equalsIgnoreCase(getSchemeName())) {
-            throw new MalformedChallengeException(
-              "Invalid " + getSchemeName() + " challenge: " + challenge); 
-        }
-        mParams = AuthChallengeParser.extractParams(challenge);
-        mComplete = true;
-    }
-
-    /**
-     * Tests if the Bearer authentication process has been completed.
-     * 
-     * @return 'true' if Bearer authorization has been processed, 'false' otherwise.
-     */
-    public boolean isComplete() {
-        return this.mComplete;
-    }
-
-    /**
-     * Produces bearer authorization string for the given set of 
-     * {@link Credentials}.
-     * 
-     * @param   credentials                     The set of credentials to be used for authentication
-     * @param   method                          Method name is ignored by the bearer authentication scheme
-     * @param   uri                             URI is ignored by the bearer authentication scheme
-     * @throws  InvalidCredentialsException     If authentication credentials are not valid or not applicable 
-     *                                          for this authentication scheme
-     * @throws  AuthenticationException         If authorization string cannot be generated due to an authentication failure
-     * @return  A bearer authorization string
-     */
-    public String authenticate(Credentials credentials, String method, String uri) throws AuthenticationException {
-        BearerCredentials bearer;
-        try {
-            bearer = (BearerCredentials) credentials;
-        } catch (ClassCastException e) {
-            throw new InvalidCredentialsException(
-             "Credentials cannot be used for bearer authentication: " 
-              + credentials.getClass().getName());
-        }
-        return BearerAuthScheme.authenticate(bearer);
-    }
-
-    
-    /**
-     * Returns 'false'. Bearer authentication scheme is request based.
-     * 
-     * @return 'false'.
-     */
-    public boolean isConnectionBased() {
-        return false;    
-    }
-
-    /**
-     * Produces bearer authorization string for the given set of {@link Credentials}.
-     * 
-     * @param   credentials                     The set of credentials to be used for authentication
-     * @param   method                          The method being authenticated
-     * @throws  InvalidCredentialsException     If authentication credentials are not valid or not applicable for this authentication 
-     *                                          scheme.
-     * @throws AuthenticationException         If authorization string cannot be generated due to an authentication failure.
-     * 
-     * @return a basic authorization string
-     */
-    public String authenticate(Credentials credentials, HttpMethod method) throws AuthenticationException {
-        if (method == null) {
-            throw new IllegalArgumentException("Method may not be null");
-        }
-        BearerCredentials bearer = null;
-        try {
-            bearer = (BearerCredentials) credentials;
-        } catch (ClassCastException e) {
-            throw new InvalidCredentialsException(
-                    "Credentials cannot be used for bearer authentication: " 
-                    + credentials.getClass().getName());
-        }
-        return BearerAuthScheme.authenticate(
-            bearer, 
-            method.getParams().getCredentialCharset());
-    }
-    
-    /**
-     * Returns a bearer Authorization header value for the given
-     * {@link BearerCredentials}.
-     * 
-     * @param   credentials     The credentials to encode.
-     * 
-     * @return                  A bearer authorization string
-     */
-    public static String authenticate(BearerCredentials credentials) {
-        return authenticate(credentials, "ISO-8859-1");
-    }
-
-    /**
-     * Returns a bearer Authorization header value for the given 
-     * {@link BearerCredentials} and charset.
-     * 
-     * @param   credentials         The credentials to encode.
-     * @param   charset             The charset to use for encoding the credentials
-     * 
-     * @return                      A bearer authorization string
-     * 
-     * @since 3.0
-     */
-    public static String authenticate(BearerCredentials credentials, String charset) {
-
-        if (credentials == null) {
-            throw new IllegalArgumentException("Credentials may not be null"); 
-        }
-        if (charset == null || charset.length() == 0) {
-            throw new IllegalArgumentException("charset may not be null or empty");
-        }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(credentials.getAccessToken());
-
-        return "Bearer " + buffer.toString();
-    }
-
-    /**
-     * Returns a String identifying the authentication challenge.  This is
-     * used, in combination with the host and port to determine if
-     * authorization has already been attempted or not.  Schemes which
-     * require multiple requests to complete the authentication should
-     * return a different value for each stage in the request.
-     * 
-     * Additionally, the ID should take into account any changes to the
-     * authentication challenge and return a different value when appropriate.
-     * For example when the realm changes in basic authentication it should be
-     * considered a different authentication attempt and a different value should
-     * be returned.
-     * 
-     * This method simply returns the realm for the challenge.
-     * 
-     * @return String       a String identifying the authentication challenge.
-     */
-    @Override
-    public String getID() {
-        return getRealm();
-    }
-
-    /**
-     * Returns authentication parameter with the given name, if available.
-     * 
-     * @param   name    The name of the parameter to be returned
-     * 
-     * @return          The parameter with the given name
-     */
-    @Override
-    public String getParameter(String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name may not be null"); 
-        }
-        if (mParams == null) {
-            return null;
-        }
-        return (String) mParams.get(name.toLowerCase());
-    }
-
-    /**
-     * Returns authentication realm. The realm may not be null.
-     * 
-     * @return  The authentication realm
-     */
-    @Override
-    public String getRealm() {
-        return getParameter("realm");
-    }
-    
-}
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java
index c815bc4c..f83e6fd5 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java
@@ -24,16 +24,15 @@
 
 package com.owncloud.android.lib.common.authentication.oauth;
 
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.util.LangUtils;
 
 /**
- * Bearer token {@link Credentials}
  *
  * @author David A. Velasco
  */
-public class BearerCredentials implements Credentials {
+public class BearerCredentials {
 
+    public static final int HASH_SEED = 17;
+    public static final int HASH_OFFSET = 37;
     
     private String mAccessToken;
     
@@ -76,9 +75,7 @@ public class BearerCredentials implements Credentials {
      * @return The hash code of the access token
      */
     public int hashCode() {
-        int hash = LangUtils.HASH_SEED;
-        hash = LangUtils.hashCode(hash, mAccessToken);
-        return hash;
+       return HASH_SEED * HASH_OFFSET + mAccessToken.hashCode();
     }
 
     /**
@@ -93,7 +90,7 @@ public class BearerCredentials implements Credentials {
         if (this == o) return true;
         if (this.getClass().equals(o.getClass())) {
             BearerCredentials that = (BearerCredentials) o;
-            if (LangUtils.equals(mAccessToken, that.mAccessToken)) {
+            if (mAccessToken.equals(that.mAccessToken)) {
                 return true;
             }
         }
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index a892d812..76321402 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -29,6 +29,10 @@ package com.owncloud.android.lib.common.http;
  */
 public class HttpConstants {
 
+    /***********************************************************************************************************
+     *************************************************** HEADERS ***********************************************
+     ***********************************************************************************************************/
+
     /***********************************************************************************************************
      *************************************************** HEADERS ***********************************************
      ***********************************************************************************************************/
diff --git a/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
deleted file mode 100644
index 873ec656..00000000
--- a/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.network;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.UnknownHostException;
-import java.security.cert.X509Certificate;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
-
-import com.owncloud.android.lib.common.utils.Log_OC;
-
-
-/**
- * AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with
- * a custom SSLContext and an optional Hostname Verifier.
- *
- * @author David A. Velasco
- */
-
-public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory {
-
-    private static final String TAG = AdvancedSslSocketFactory.class.getSimpleName();
-
-    private SSLContext mSslContext = null;
-    private AdvancedX509TrustManager mTrustManager = null;
-    private X509HostnameVerifier mHostnameVerifier = null;
-
-    public SSLContext getSslContext() {
-        return mSslContext;
-    }
-
-    /**
-     * Constructor for AdvancedSSLProtocolSocketFactory.
-     */
-    public AdvancedSslSocketFactory(
-        SSLContext sslContext, AdvancedX509TrustManager trustManager, X509HostnameVerifier hostnameVerifier
-    ) {
-
-        if (sslContext == null)
-            throw new IllegalArgumentException("AdvancedSslSocketFactory can not be created with a null SSLContext");
-        if (trustManager == null && mHostnameVerifier != null)
-            throw new IllegalArgumentException(
-                "AdvancedSslSocketFactory can not be created with a null Trust Manager and a " +
-                    "not null Hostname Verifier"
-            );
-        mSslContext = sslContext;
-        mTrustManager = trustManager;
-        mHostnameVerifier = hostnameVerifier;
-    }
-
-    /**
-     * @see ProtocolSocketFactory#createSocket(java.lang.String, int, java.net.InetAddress, int)
-     */
-    @Override
-    public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort)
-        throws IOException, UnknownHostException {
-
-        Socket socket = mSslContext.getSocketFactory().createSocket(host, port, clientHost, clientPort);
-        enableSecureProtocols(socket);
-        verifyPeerIdentity(host, port, socket);
-        return socket;
-    }
-
-    /*
-    private void logSslInfo() {
-    	if (Build.VERSION.SDK_INT > Build.VERSION_CODES.FROYO) {
-	    	Log_OC.v(TAG, "SUPPORTED SSL PARAMETERS");
-	    	logSslParameters(mSslContext.getSupportedSSLParameters());
-	    	Log_OC.v(TAG, "DEFAULT SSL PARAMETERS");
-	    	logSslParameters(mSslContext.getDefaultSSLParameters());
-	    	Log_OC.i(TAG, "CURRENT PARAMETERS");
-	    	Log_OC.i(TAG, "Protocol: " + mSslContext.getProtocol());
-    	}
-    	Log_OC.i(TAG, "PROVIDER");
-    	logSecurityProvider(mSslContext.getProvider());
-	}
-    
-    private void logSecurityProvider(Provider provider) {
-    	Log_OC.i(TAG, "name: " + provider.getName());
-    	Log_OC.i(TAG, "version: " + provider.getVersion());
-    	Log_OC.i(TAG, "info: " + provider.getInfo());
-    	Enumeration<?> keys = provider.propertyNames();
-    	String key;
-    	while (keys.hasMoreElements()) {
-    		key = (String) keys.nextElement();
-        	Log_OC.i(TAG, "  property " + key + " : " + provider.getProperty(key));
-    	}
-	}
-
-	private void logSslParameters(SSLParameters params) {
-    	Log_OC.v(TAG, "Cipher suites: ");
-    	String [] elements = params.getCipherSuites();
-    	for (int i=0; i<elements.length ; i++) {
-    		Log_OC.v(TAG, "  " + elements[i]);
-    	}
-    	Log_OC.v(TAG, "Protocols: ");
-    	elements = params.getProtocols();
-    	for (int i=0; i<elements.length ; i++) {
-    		Log_OC.v(TAG, "  " + elements[i]);
-    	}
-	}
-	*/
-
-    /**
-     * Attempts to get a new socket connection to the given host within the
-     * given time limit.
-     *
-     * @param host         the host name/IP
-     * @param port         the port on the host
-     * @param localAddress the local host name/IP to bind the socket to
-     * @param localPort    the port on the local machine
-     * @param params       {@link HttpConnectionParams Http connection parameters}
-     * @return Socket a new socket
-     * @throws IOException          if an I/O error occurs while creating the socket
-     * @throws UnknownHostException if the IP address of the host cannot be
-     *                              determined
-     */
-    @Override
-    public Socket createSocket(final String host, final int port,
-                               final InetAddress localAddress, final int localPort,
-                               final HttpConnectionParams params) throws IOException,
-        UnknownHostException, ConnectTimeoutException {
-        Log_OC.d(TAG, "Creating SSL Socket with remote " + host + ":" + port + ", local " + localAddress + ":" +
-            localPort + ", params: " + params);
-        if (params == null) {
-            throw new IllegalArgumentException("Parameters may not be null");
-        }
-        int timeout = params.getConnectionTimeout();
-
-        //logSslInfo();
-
-        SocketFactory socketfactory = mSslContext.getSocketFactory();
-        Log_OC.d(TAG, " ... with connection timeout " + timeout + " and socket timeout " + params.getSoTimeout());
-        Socket socket = socketfactory.createSocket();
-        enableSecureProtocols(socket);
-        SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
-        SocketAddress remoteaddr = new InetSocketAddress(host, port);
-        socket.setSoTimeout(params.getSoTimeout());
-        WriteTimeoutEnforcer.setSoWriteTimeout(params.getSoTimeout(), socket);
-        socket.bind(localaddr);
-        ServerNameIndicator.setServerNameIndication(host, (SSLSocket) socket);
-        socket.connect(remoteaddr, timeout);
-        verifyPeerIdentity(host, port, socket);
-        return socket;
-    }
-
-    /**
-     * @see ProtocolSocketFactory#createSocket(java.lang.String, int)
-     */
-    @Override
-    public Socket createSocket(String host, int port) throws IOException,
-        UnknownHostException {
-        Log_OC.d(TAG, "Creating SSL Socket with remote " + host + ":" + port);
-        Socket socket = mSslContext.getSocketFactory().createSocket(host, port);
-        enableSecureProtocols(socket);
-        verifyPeerIdentity(host, port, socket);
-        return socket;
-    }
-
-
-    @Override
-    public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException,
-        UnknownHostException {
-        Socket sslSocket = mSslContext.getSocketFactory().createSocket(socket, host, port, autoClose);
-        enableSecureProtocols(sslSocket);
-        verifyPeerIdentity(host, port, sslSocket);
-        return sslSocket;
-    }
-
-
-    public boolean equals(Object obj) {
-        return ((obj != null) && obj.getClass().equals(
-            AdvancedSslSocketFactory.class));
-    }
-
-    public int hashCode() {
-        return AdvancedSslSocketFactory.class.hashCode();
-    }
-
-
-    public X509HostnameVerifier getHostNameVerifier() {
-        return mHostnameVerifier;
-    }
-
-
-    public void setHostNameVerifier(X509HostnameVerifier hostnameVerifier) {
-        mHostnameVerifier = hostnameVerifier;
-    }
-
-    /**
-     * Verifies the identity of the server.
-     *
-     * The server certificate is verified first.
-     *
-     * Then, the host name is compared with the content of the server certificate using the current host name verifier,
-     * if any.
-     *
-     * @param socket
-     */
-    private void verifyPeerIdentity(String host, int port, Socket socket) throws IOException {
-        try {
-            CertificateCombinedException failInHandshake = null;
-            /// 1. VERIFY THE SERVER CERTIFICATE through the registered TrustManager 
-            ///	(that should be an instance of AdvancedX509TrustManager) 
-            try {
-                SSLSocket sock = (SSLSocket) socket;    // a new SSLSession instance is created as a "side effect" 
-                sock.startHandshake();
-
-            } catch (RuntimeException e) {
-
-                if (e instanceof CertificateCombinedException) {
-                    failInHandshake = (CertificateCombinedException) e;
-                } else {
-                    Throwable cause = e.getCause();
-                    Throwable previousCause = null;
-                    while (cause != null &&
-                        cause != previousCause &&
-                        !(cause instanceof CertificateCombinedException)) {
-                        previousCause = cause;
-                        cause = cause.getCause();
-                    }
-                    if (cause != null && cause instanceof CertificateCombinedException) {
-                        failInHandshake = (CertificateCombinedException) cause;
-                    }
-                }
-                if (failInHandshake == null) {
-                    throw e;
-                }
-                failInHandshake.setHostInUrl(host);
-
-            }
-
-            /// 2. VERIFY HOSTNAME
-            SSLSession newSession = null;
-            boolean verifiedHostname = true;
-            if (mHostnameVerifier != null) {
-                if (failInHandshake != null) {
-                    /// 2.1 : a new SSLSession instance was NOT created in the handshake
-                    X509Certificate serverCert = failInHandshake.getServerCertificate();
-                    try {
-                        mHostnameVerifier.verify(host, serverCert);
-                    } catch (SSLException e) {
-                        verifiedHostname = false;
-                    }
-
-                } else {
-                    /// 2.2 : a new SSLSession instance was created in the handshake
-                    newSession = ((SSLSocket) socket).getSession();
-                    if (!mTrustManager.isKnownServer((X509Certificate) (newSession.getPeerCertificates()[0]))) {
-                        verifiedHostname = mHostnameVerifier.verify(host, newSession);
-                    }
-                }
-            }
-
-            /// 3. Combine the exceptions to throw, if any
-            if (!verifiedHostname) {
-                SSLPeerUnverifiedException pue = new SSLPeerUnverifiedException(
-                    "Names in the server certificate do not match to " + host + " in the URL"
-                );
-                if (failInHandshake == null) {
-                    failInHandshake = new CertificateCombinedException(
-                        (X509Certificate) newSession.getPeerCertificates()[0]
-                    );
-                    failInHandshake.setHostInUrl(host);
-                }
-                failInHandshake.setSslPeerUnverifiedException(pue);
-                pue.initCause(failInHandshake);
-                throw pue;
-
-            } else if (failInHandshake != null) {
-                SSLHandshakeException hse = new SSLHandshakeException("Server certificate could not be verified");
-                hse.initCause(failInHandshake);
-                throw hse;
-            }
-
-        } catch (IOException io) {
-            try {
-                socket.close();
-            } catch (Exception x) {
-                // NOTHING - irrelevant exception for the caller 
-            }
-            throw io;
-        }
-    }
-
-    /**
-     * Grants that all protocols supported by the Security Provider in mSslContext are enabled in socket.
-     *
-     * Grants also that no unsupported protocol is tried to be enabled. That would trigger an exception, breaking
-     * the connection process although some protocols are supported.
-     *
-     * This is not cosmetic: not all the supported protocols are enabled by default. Too see an overview of
-     * supported and enabled protocols in the stock Security Provider in Android see the tables in
-     * http://developer.android.com/reference/javax/net/ssl/SSLSocket.html.
-     *
-     * @param socket
-     */
-    private void enableSecureProtocols(Socket socket) {
-        SSLParameters params = mSslContext.getSupportedSSLParameters();
-        String[] supportedProtocols = params.getProtocols();
-        ((SSLSocket) socket).setEnabledProtocols(supportedProtocols);
-    }
-
-}
diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
index f16be1ff..e5017112 100644
--- a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
+++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
@@ -35,7 +35,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.httpclient.methods.RequestEntity;
+
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -45,7 +45,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
  * 
  * @author David A. Velasco
  */
-public class ChunkFromFileChannelRequestEntity implements RequestEntity, ProgressiveDataTransferer {
+public class ChunkFromFileChannelRequestEntity implements ProgressiveDataTransferer {
 
     private static final String TAG = ChunkFromFileChannelRequestEntity.class.getSimpleName();
     
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
index 3548dd5e..2bc0ee27 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
@@ -25,18 +25,12 @@
 
 package com.owncloud.android.lib.common.network;
 
-import org.apache.commons.httpclient.methods.RequestEntity;
+
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 
@@ -45,7 +39,7 @@ import java.util.Set;
  * A RequestEntity that represents a File.
  * 
  */
-public class FileRequestEntity implements RequestEntity, ProgressiveDataTransferer {
+public class FileRequestEntity implements ProgressiveDataTransferer {
 
     final File mFile;
     final String mContentType;
@@ -59,22 +53,11 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
             throw new IllegalArgumentException("File may not be null");
         }
     }
-    
-    @Override
-    public long getContentLength() {
-        return mFile.length();
-    }
 
-    @Override
     public String getContentType() {
         return mContentType;
     }
 
-    @Override
-    public boolean isRepeatable() {
-        return true;
-    }
-
     @Override
     public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
         synchronized (mDataTransferListeners) {
@@ -95,59 +78,6 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
             mDataTransferListeners.remove(listener);
         }
     }
-    
-    
-    @Override
-    public void writeRequest(final OutputStream out) throws IOException {
-        ByteBuffer tmp = ByteBuffer.allocate(4096);
-        int readResult = 0;
-        
-        RandomAccessFile raf = new RandomAccessFile(mFile, "r");
-        FileChannel channel = raf.getChannel();
-        Iterator<OnDatatransferProgressListener> it = null;
-        long transferred = 0;
-        long size = mFile.length();
-        if (size == 0) size = -1;
-        try {
-            while ((readResult = channel.read(tmp)) >= 0) {
-                try {
-                    out.write(tmp.array(), 0, readResult);
-                } catch (IOException io) {
-                    // work-around try catch to filter exception in writing
-                    throw new WriteException(io);
-                }
-                tmp.clear();
-                transferred += readResult;
-                synchronized (mDataTransferListeners) {
-                    it = mDataTransferListeners.iterator();
-                    while (it.hasNext()) {
-                        it.next().onTransferProgress(readResult, transferred, size, mFile.getAbsolutePath());
-                    }
-                }
-            }
-
-        } catch (IOException io) {
-            // any read problem will be handled as if the file is not there
-            if (io instanceof FileNotFoundException) {
-                throw io;
-            } else {
-                FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
-                fnf.initCause(io);
-                throw fnf;
-            }
-
-        } catch (WriteException we) {
-            throw we.getWrapped();
-
-        } finally {
-            try {
-                channel.close();
-                raf.close();
-            } catch (IOException io) {
-                // ignore failures closing source file
-            }
-        }
-    }
 
     protected static class WriteException extends Exception {
         IOException mWrapped;
diff --git a/src/com/owncloud/android/lib/common/network/NetworkUtils.java b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
index b5fa0cde..71740bc1 100644
--- a/src/com/owncloud/android/lib/common/network/NetworkUtils.java
+++ b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
@@ -39,8 +39,8 @@ import java.security.cert.CertificateException;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.protocol.Protocol;
+
+
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
@@ -64,67 +64,7 @@ public class NetworkUtils {
     /** Standard name for protocol TLS version 1.0 in JSSE API */
     public static final String PROTOCOL_TLSv1_0 = "TLSv1";
 
-    /** Connection manager for all the OwnCloudClients */
-    private static MultiThreadedHttpConnectionManager mConnManager = null;
-    
-    private static Protocol mDefaultHttpsProtocol = null;
-
-    private static AdvancedSslSocketFactory mAdvancedSslSocketFactory = null;
-
     private static X509HostnameVerifier mHostnameVerifier = null;
-    
-    
-    /**
-     * Registers or unregisters the proper components for advanced SSL handling.
-     * @throws IOException 
-     */
-    @SuppressWarnings("deprecation")
-	public static void registerAdvancedSslContext(boolean register, Context context) 
-    		throws GeneralSecurityException, IOException {
-        Protocol pr = null;
-        try {
-            pr = Protocol.getProtocol("https");
-            if (pr != null && mDefaultHttpsProtocol == null) {
-                mDefaultHttpsProtocol = pr;
-            }
-        } catch (IllegalStateException e) {
-            // nothing to do here; really
-        }
-        boolean isRegistered = (pr != null && pr.getSocketFactory() instanceof AdvancedSslSocketFactory);
-        if (register && !isRegistered) {
-            Protocol.registerProtocol("https", new Protocol("https", getAdvancedSslSocketFactory(context), 443));
-            
-        } else if (!register && isRegistered) {
-            if (mDefaultHttpsProtocol != null) {
-                Protocol.registerProtocol("https", mDefaultHttpsProtocol);
-            }
-        }
-    }
-    
-    public static AdvancedSslSocketFactory getAdvancedSslSocketFactory(Context context) 
-    		throws GeneralSecurityException, IOException {
-        if (mAdvancedSslSocketFactory  == null) {
-            KeyStore trustStore = getKnownServersStore(context);
-            AdvancedX509TrustManager trustMgr = new AdvancedX509TrustManager(trustStore);
-            TrustManager[] tms = new TrustManager[] { trustMgr };
-                
-            SSLContext sslContext;
-            try {
-            	sslContext = SSLContext.getInstance("TLSv1.2");
-            } catch (NoSuchAlgorithmException e) {
-            	Log_OC.w(TAG, "TLSv1.2 is not supported in this device; falling through TLSv1.0");
-            	sslContext = SSLContext.getInstance("TLSv1");
-            	// should be available in any device; see reference of supported protocols in 
-            	// http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
-            }
-            sslContext.init(null, tms, null);
-                    
-            mHostnameVerifier = new BrowserCompatHostnameVerifier();
-            mAdvancedSslSocketFactory = new AdvancedSslSocketFactory(sslContext, trustMgr, mHostnameVerifier);
-        }
-        return mAdvancedSslSocketFactory;
-    }
-
 
     private static String LOCAL_TRUSTSTORE_FILENAME = "knownServers.bks";
     
@@ -183,16 +123,6 @@ public class NetworkUtils {
             fos.close();
         }
     }
-    
-    
-    static public MultiThreadedHttpConnectionManager getMultiThreadedConnManager() {
-        if (mConnManager == null) {
-            mConnManager = new MultiThreadedHttpConnectionManager();
-            mConnManager.getParams().setDefaultMaxConnectionsPerHost(5);
-            mConnManager.getParams().setMaxTotalConnections(5);
-        }
-        return mConnManager;
-    }
 
     public static boolean isCertInKnownServersStore(Certificate cert, Context context) 
     		throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
diff --git a/src/com/owncloud/android/lib/common/network/RedirectionPath.java b/src/com/owncloud/android/lib/common/network/RedirectionPath.java
index eb8a8919..5f1b67ce 100644
--- a/src/com/owncloud/android/lib/common/network/RedirectionPath.java
+++ b/src/com/owncloud/android/lib/common/network/RedirectionPath.java
@@ -27,7 +27,9 @@
 
 package com.owncloud.android.lib.common.network;
 
-import org.apache.commons.httpclient.HttpStatus;
+
+
+import com.owncloud.android.lib.common.http.HttpConstants;
 
 import java.util.Arrays;
 
@@ -108,7 +110,7 @@ public class RedirectionPath {
      */
     public String getLastPermanentLocation() {
         for (int i = mLastStatus; i >= 0; i--) {
-            if (mStatuses[i] == HttpStatus.SC_MOVED_PERMANENTLY && i <= mLastLocation) {
+            if (mStatuses[i] == HttpConstants.HTTP_MOVED_PERMANENTLY && i <= mLastLocation) {
                 return mLocations[i];
             }
         }
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 4b1d1347..c667ee1c 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -28,14 +28,15 @@ import android.accounts.Account;
 import android.accounts.AccountsException;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpStatus;
+
+
+
+
 import org.apache.jackrabbit.webdav.DavException;
 import org.json.JSONException;
 
@@ -55,6 +56,7 @@ import java.util.Map;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLPeerUnverifiedException;
 
+import at.bitfire.dav4android.exception.HttpException;
 import okhttp3.Headers;
 
 
@@ -180,9 +182,6 @@ public class RemoteOperationResult implements Serializable {
         } else if (e instanceof SocketTimeoutException) {
             mCode = ResultCode.TIMEOUT;
 
-        } else if (e instanceof ConnectTimeoutException) {
-            mCode = ResultCode.TIMEOUT;
-
         } else if (e instanceof MalformedURLException) {
             mCode = ResultCode.INCORRECT_ADDRESS;
 
@@ -221,64 +220,6 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
-    /**
-     * Public constructor from separate elements of an HTTP or DAV response.
-     *
-     * To be used when the result needs to be interpreted from the response of an HTTP/DAV method.
-     *
-     * Determines a {@link ResultCode} from the already executed method received as a parameter. Generally,
-     * will depend on the HTTP code and HTTP response headers received. In some cases will inspect also the
-     * response body.
-     *
-     * @param success    The operation was considered successful or not.
-     * @param httpMethod HTTP/DAV method already executed which response will be examined to interpret the
-     *                   result.
-     */
-    // TODO Delete this
-    public RemoteOperationResult(boolean success, HttpMethod httpMethod) throws IOException {
-//        this(
-//                success,
-//                httpMethod.getStatusCode(),
-//                httpMethod.getStatusText(),
-//                httpMethod.getResponseHeaders()
-//        );
-
-        if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
-
-            String bodyResponse = httpMethod.getResponseBodyAsString();
-            // do not get for other HTTP codes!; could not be available
-
-            if (bodyResponse != null && bodyResponse.length() > 0) {
-                InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
-                InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
-                try {
-                    if (xmlParser.parseXMLResponse(is)) {
-                        mCode = ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER;
-                    }
-
-                } catch (Exception e) {
-                    Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
-                    // mCode stays as set in this(success, httpCode, headers)
-                }
-            }
-        }
-
-        if (mHttpCode == HttpStatus.SC_FORBIDDEN) {  // 403
-
-            parseErrorMessageAndSetCode(httpMethod, ResultCode.SPECIFIC_FORBIDDEN);
-        }
-
-        if (mHttpCode == HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE) {    // 415
-
-            parseErrorMessageAndSetCode(httpMethod, ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE);
-        }
-
-        if (mHttpCode == HttpStatus.SC_SERVICE_UNAVAILABLE) {   // 503
-
-            parseErrorMessageAndSetCode(httpMethod, ResultCode.SPECIFIC_SERVICE_UNAVAILABLE);
-        }
-    }
-
     /**
      * Public constructor from separate elements of an HTTP or DAV response.
      *
@@ -297,7 +238,7 @@ public class RemoteOperationResult implements Serializable {
                 httpMethod.getResponseHeaders()
         );
 
-        if (mHttpCode == HttpStatus.SC_BAD_REQUEST) {   // 400
+        if (mHttpCode == HttpConstants.HTTP_FORBIDDEN) {   // 400
             String bodyResponse = httpMethod.getResponseBodyAsString();
 
             // do not get for other HTTP codes!; could not be available
@@ -318,19 +259,19 @@ public class RemoteOperationResult implements Serializable {
 
         // before
         switch (mHttpCode) {
-            case HttpStatus.SC_FORBIDDEN:
+            case HttpConstants.HTTP_FORBIDDEN:
                 parseErrorMessageAndSetCode(
                         httpMethod.getResponseBodyAsString(),
                         ResultCode.SPECIFIC_FORBIDDEN
                 );
                 break;
-            case HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE:
+            case HttpConstants.HTTP_UNSUPPORTED_MEDIA_TYPE:
                 parseErrorMessageAndSetCode(
                         httpMethod.getResponseBodyAsString(),
                         ResultCode.SPECIFIC_UNSUPPORTED_MEDIA_TYPE
                 );
                 break;
-            case HttpStatus.SC_SERVICE_UNAVAILABLE:
+            case HttpConstants.HTTP_SERVICE_UNAVAILABLE:
                 parseErrorMessageAndSetCode(
                         httpMethod.getResponseBodyAsString(),
                         ResultCode.SPECIFIC_SERVICE_UNAVAILABLE
@@ -341,36 +282,6 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
-    /**
-     * Parse the error message included in the body response, if any, and set the specific result
-     * code
-     * @param httpMethod HTTP/DAV method already executed which response body will be parsed to get
-     *                   the specific error message
-     * @param resultCode specific result code
-     * @throws IOException
-     */
-    private void parseErrorMessageAndSetCode(HttpMethod httpMethod, ResultCode resultCode)
-            throws IOException {
-
-        String bodyResponse = httpMethod.getResponseBodyAsString();
-
-        if (bodyResponse != null && bodyResponse.length() > 0) {
-            InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
-            ErrorMessageParser xmlParser = new ErrorMessageParser();
-            try {
-                String errorMessage = xmlParser.parseXMLResponse(is);
-                if (errorMessage != "" && errorMessage != null) {
-                    mCode = resultCode;
-                    mHttpPhrase = errorMessage;
-                }
-            } catch (Exception e) {
-                Log_OC.w(TAG, "Error reading exception from server: " + e.getMessage());
-                // mCode stays as set in this(success, httpCode, headers)
-            }
-        }
-    }
-
-
     /**
      * Parse the error message included in the body response, if any, and set the specific result
      * code
@@ -403,8 +314,6 @@ public class RemoteOperationResult implements Serializable {
      * To be used when the result needs to be interpreted from HTTP response elements that could come from
      * different requests (WARNING: black magic, try to avoid).
      *
-     * If all the fields come from the same HTTP/DAV response, {@link #RemoteOperationResult(boolean, HttpMethod)}
-     * should be used instead.
      *
      * Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
      *
@@ -445,25 +354,25 @@ public class RemoteOperationResult implements Serializable {
 
         if (httpCode > 0) {
             switch (httpCode) {
-                case HttpStatus.SC_UNAUTHORIZED:                    // 401
+                case HttpConstants.HTTP_UNAUTHORIZED:                    // 401
                     mCode = ResultCode.UNAUTHORIZED;
                     break;
-                case HttpStatus.SC_FORBIDDEN:                       // 403
+                case HttpConstants.HTTP_FORBIDDEN:                       // 403
                     mCode = ResultCode.FORBIDDEN;
                     break;
-                case HttpStatus.SC_NOT_FOUND:                       // 404
+                case HttpConstants.HTTP_NOT_FOUND:                       // 404
                     mCode = ResultCode.FILE_NOT_FOUND;
                     break;
-                case HttpStatus.SC_CONFLICT:                        // 409
+                case HttpConstants.HTTP_CONFLICT:                        // 409
                     mCode = ResultCode.CONFLICT;
                     break;
-                case HttpStatus.SC_INTERNAL_SERVER_ERROR:           // 500
+                case HttpConstants.HTTP_INTERNAL_SERVER_ERROR:           // 500
                     mCode = ResultCode.INSTANCE_NOT_CONFIGURED;     // assuming too much...
                     break;
-                case HttpStatus.SC_SERVICE_UNAVAILABLE:             // 503
+                case HttpConstants.HTTP_SERVICE_UNAVAILABLE:             // 503
                     mCode = ResultCode.SERVICE_UNAVAILABLE;
                     break;
-                case HttpStatus.SC_INSUFFICIENT_STORAGE:            // 507
+                case HttpConstants.HTTP_INSUFFICIENT_STORAGE:            // 507
                     mCode = ResultCode.QUOTA_EXCEEDED;              // surprise!
                     break;
                 default:
@@ -547,9 +456,6 @@ public class RemoteOperationResult implements Serializable {
             } else if (mException instanceof SocketTimeoutException) {
                 return "Socket timeout exception";
 
-            } else if (mException instanceof ConnectTimeoutException) {
-                return "Connect timeout exception";
-
             } else if (mException instanceof MalformedURLException) {
                 return "Malformed URL exception";
 
@@ -628,7 +534,7 @@ public class RemoteOperationResult implements Serializable {
     }
 
     public boolean isServerFail() {
-        return (mHttpCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        return (mHttpCode >= HttpConstants.HTTP_INTERNAL_SERVER_ERROR);
     }
 
     public boolean isException() {
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 6a4d5a2f..719a25d1 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -117,7 +117,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 //                get = new GetMethod(redirectedLocation);
 //                status = client.executeRequest(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
 //                mLatestResult = new RemoteOperationResult(
-//                    (status == HttpStatus.SC_OK),
+//                    (status == HttpConstants.HTTP_OK),
 //                    get
 //                );
 //                redirectedLocation = mLatestResult.getRedirectedLocation();
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 2231ac14..1d72b7cb 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -26,6 +26,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -33,7 +34,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -182,7 +182,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
 
     public static class ResultData {
diff --git a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
index 9be2fab8..1612873c 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
@@ -41,12 +41,6 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-
-import com.owncloud.android.lib.common.network.AdvancedSslSocketFactory;
-
 
 /**
  * SelfSignedConfidentSslSocketFactory allows to create SSL {@link Socket}s 
diff --git a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
index 46beb44e..2a4333ed 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
@@ -30,8 +30,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
 
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
index 4c9e0d97..9c6bf379 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
@@ -42,9 +42,9 @@ import com.owncloud.android.lib.test_project.TestActivity;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
+
 
 import java.io.File;
 import java.security.GeneralSecurityException;
@@ -373,7 +373,7 @@ public class CopyFileTest extends ActivityInstrumentationTestCase2<TestActivity>
                 false
         );
         result = copyOperation.execute(mClient);
-        assertTrue(result.getHttpCode() == HttpStatus.SC_CONFLICT);
+        assertTrue(result.getHttpCode() == HttpConstants.HTTP_CONFLICT);
 
         // target location (renaming) has invalid characters
         copyOperation = new CopyRemoteFileOperation(
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
index bbdd37d0..fa950575 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
@@ -29,8 +29,8 @@ import java.security.GeneralSecurityException;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
index e9d25fd2..9055c162 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
@@ -29,9 +29,9 @@ import java.security.GeneralSecurityException;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -184,11 +184,11 @@ public class GetShareesTest extends RemoteTest {
 		// search for sharees including wrong page values
 		getShareesOperation = new GetRemoteShareesOperation("a", 0, 50);
 		result = getShareesOperation.execute(mClient);
-		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
+		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpConstants.HTTP_BAD_REQUEST);
 		
 		getShareesOperation = new GetRemoteShareesOperation("a", 1, 0);
 		result = getShareesOperation.execute(mClient);
-		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
+		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpConstants.HTTP_BAD_REQUEST);
 	}
 	
 	/**
@@ -237,11 +237,11 @@ public class GetShareesTest extends RemoteTest {
 		// search for sharees including wrong page values
 		getShareesOperation = new GetRemoteShareesOperation("@", 0, 50);
 		result = getShareesOperation.execute(mClient);
-		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
+		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpConstants.HTTP_BAD_REQUEST);
 		
 		getShareesOperation = new GetRemoteShareesOperation("@", 1, 0);
 		result = getShareesOperation.execute(mClient);
-		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
+		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpConstants.HTTP_BAD_REQUEST);
 	}
 	
 	@Override
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserAvatarTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserAvatarTest.java
index fc61ed31..46dfe8a8 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserAvatarTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserAvatarTest.java
@@ -31,7 +31,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation.ResultData;
 import com.owncloud.android.lib.test_project.TestActivity;
 
-import org.apache.commons.httpclient.HttpStatus;
+
 
 /**
  * Class to test {@link GetRemoteUserAvatarOperation}
@@ -81,7 +81,7 @@ public class GetUserAvatarTest extends RemoteTest {
         // request again, with the just received etag
         result = mActivity.getUserAvatar(AVATAR_DIMENSION, etag);
         assertFalse(result.isSuccess());
-        assertTrue(result.getHttpCode() == HttpStatus.SC_NOT_MODIFIED);
+        assertTrue(result.getHttpCode() == HttpConstants.HTTP_NOT_MODIFIED);
     }
     */
 
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
index 9ac235ce..76215cb3 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
@@ -29,9 +29,9 @@ import java.security.GeneralSecurityException;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
+
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
@@ -373,7 +373,7 @@ public class MoveFileTest extends RemoteTest {
 				false
 		);
 		result = moveOperation.execute(mClient);
-		assertTrue(result.getHttpCode() == HttpStatus.SC_CONFLICT);
+		assertTrue(result.getHttpCode() == HttpConstants.HTTP_CONFLICT);
 
 		// target location (renaming) has invalid characters
 		moveOperation = new MoveRemoteFileOperation(
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
index 206fa0cc..9d7dca35 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
@@ -27,12 +27,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.SocketTimeoutException;
 import java.security.GeneralSecurityException;
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.httpclient.HttpStatus;
+
+
+
+
+
+
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
@@ -314,7 +314,7 @@ public class OwnCloudClientTest extends AndroidTestCase {
 					DavConstants.DEPTH_0);
 			int status = client.executeMethod(propfind);
 			assertEquals("WebDAV request did not work on WebDAV URI", 
-					HttpStatus.SC_MULTI_STATUS, status);
+					HttpConstants.HTTP_MULTI_STATUS, status);
 			
         } catch (IOException e) {
         	Log.e(TAG, "Exception in PROPFIND method execution", e);
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java
index de70c7ed..408d200a 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java
@@ -25,8 +25,8 @@ package com.owncloud.android.lib.test_project.test;
 
 import java.security.GeneralSecurityException;
 
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
 
 import android.net.Uri;
 import android.test.AndroidTestCase;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
index bcc3fb82..8ad850e8 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
@@ -25,8 +25,8 @@ package com.owncloud.android.lib.test_project.test;
 
 import java.security.GeneralSecurityException;
 
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
 
 import android.net.Uri;
 import android.test.AndroidTestCase;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
index 2f1155dd..0873ddbc 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
@@ -31,8 +31,8 @@ import java.security.GeneralSecurityException;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
index a7792b84..3441b6ed 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
@@ -32,8 +32,8 @@ import java.util.Calendar;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+
+
 
 import android.content.Context;
 import android.net.Uri;

From b99723205bdc29bbba08cea5fea48bab3e659acf Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 27 Jun 2018 17:44:47 +0200
Subject: [PATCH 086/133] remove jackrabit

---
 build.gradle                                  |   1 -
 .../lib/common/network/WebdavEntry.java       | 276 ------------------
 .../lib/common/network/WebdavUtils.java       |  70 -----
 .../operations/RemoteOperationResult.java     |   6 +-
 .../lib/resources/files/RemoteFile.java       |  19 --
 5 files changed, 1 insertion(+), 371 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/common/network/WebdavEntry.java

diff --git a/build.gradle b/build.gradle
index 6d4ced96..0b0263c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,6 @@ allprojects {
 }
 
 dependencies {
-    api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
     api 'com.squareup.okhttp3:okhttp:3.10.0'
     api project(':dav4android')
 
diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
deleted file mode 100644
index 248350b3..00000000
--- a/src/com/owncloud/android/lib/common/network/WebdavEntry.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/** ownCloud Android Library is available under MIT license
- *
- *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.network;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.property.DavProperty;
-import org.apache.jackrabbit.webdav.property.DavPropertyName;
-import org.apache.jackrabbit.webdav.property.DavPropertySet;
-import org.apache.jackrabbit.webdav.xml.Namespace;
-
-import android.net.Uri;
-
-import com.owncloud.android.lib.common.utils.Log_OC;
-
-public class WebdavEntry {
-
-    private static final String TAG = WebdavEntry.class.getSimpleName();
-
-    public static final String NAMESPACE_OC = "http://owncloud.org/ns";
-    public static final String EXTENDED_PROPERTY_NAME_PERMISSIONS = "permissions";
-    public static final String EXTENDED_PROPERTY_NAME_REMOTE_ID = "id";
-    public static final String EXTENDED_PROPERTY_NAME_SIZE = "size";
-    public static final String EXTENDED_PROPERTY_NAME_PRIVATE_LINK = "privatelink";
-
-    public static final String PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes";
-    public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes";
-
-    private static final int CODE_PROP_NOT_FOUND = 404;
-
-    private String mName, mPath, mUri, mContentType, mEtag, mPermissions, mRemoteId, mPrivateLink;
-    private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize;
-    private BigDecimal mQuotaUsedBytes, mQuotaAvailableBytes;
-
-    public WebdavEntry(MultiStatusResponse ms, String splitElement) {
-        resetData();
-        if (ms.getStatus().length != 0) {
-            mUri = ms.getHref();
-
-            mPath = mUri.split(splitElement, 2)[1];
-
-            int status = ms.getStatus()[0].getStatusCode();
-            if (status == CODE_PROP_NOT_FOUND) {
-                status = ms.getStatus()[1].getStatusCode();
-            }
-            DavPropertySet propSet = ms.getProperties(status);
-            @SuppressWarnings("rawtypes")
-            DavProperty prop = propSet.get(DavPropertyName.DISPLAYNAME);
-            if (prop != null) {
-                mName = (String) prop.getName().toString();
-                mName = mName.substring(1, mName.length() - 1);
-            } else {
-                String[] tmp = mPath.split("/");
-                if (tmp.length > 0)
-                    mName = tmp[tmp.length - 1];
-            }
-
-            // use unknown mimetype as default behavior
-            // {DAV:}getcontenttype
-            mContentType = "application/octet-stream";
-            prop = propSet.get(DavPropertyName.GETCONTENTTYPE);
-            if (prop != null) {
-                mContentType = (String) prop.getValue();
-                // dvelasco: some builds of ownCloud server 4.0.x added a trailing ';'
-                // to the MIME type ; if looks fixed, but let's be cautious
-                if (mContentType.indexOf(";") >= 0) {
-                    mContentType = mContentType.substring(0, mContentType.indexOf(";"));
-                }
-            }
-
-            // check if it's a folder in the standard way: see RFC2518 12.2 . RFC4918 14.3
-            // {DAV:}resourcetype
-            prop = propSet.get(DavPropertyName.RESOURCETYPE);
-            if (prop != null) {
-                Object value = prop.getValue();
-                if (value != null) {
-                    mContentType = "DIR";   // a specific attribute would be better,
-                    // but this is enough;
-                    // unless while we have no reason to distinguish
-                    // MIME types for folders
-                }
-            }
-
-            // {DAV:}getcontentlength
-            prop = propSet.get(DavPropertyName.GETCONTENTLENGTH);
-            if (prop != null)
-                mContentLength = Long.parseLong((String) prop.getValue());
-
-            // {DAV:}getlastmodified
-            prop = propSet.get(DavPropertyName.GETLASTMODIFIED);
-            if (prop != null) {
-                Date d = WebdavUtils
-                    .parseResponseDate((String) prop.getValue());
-                mModifiedTimestamp = (d != null) ? d.getTime() : 0;
-            }
-
-            prop = propSet.get(DavPropertyName.CREATIONDATE);
-            if (prop != null) {
-                Date d = WebdavUtils
-                    .parseResponseDate((String) prop.getValue());
-                mCreateTimestamp = (d != null) ? d.getTime() : 0;
-            }
-
-            // {DAV:}getetag
-            prop = propSet.get(DavPropertyName.GETETAG);
-            if (prop != null) {
-                mEtag = (String) prop.getValue();
-                mEtag = WebdavUtils.parseEtag(mEtag);
-            }
-
-            // {DAV:}quota-used-bytes
-            prop = propSet.get(DavPropertyName.create(PROPERTY_QUOTA_USED_BYTES));
-            if (prop != null) {
-                String quotaUsedBytesSt = (String) prop.getValue();
-                try {
-                    mQuotaUsedBytes = new BigDecimal(quotaUsedBytesSt);
-                } catch (NumberFormatException e) {
-                    Log_OC.w(TAG, "No value for QuotaUsedBytes - NumberFormatException");
-                } catch (NullPointerException e) {
-                    Log_OC.w(TAG, "No value for QuotaUsedBytes - NullPointerException");
-                }
-                Log_OC.d(TAG, "QUOTA_USED_BYTES " + quotaUsedBytesSt);
-            }
-
-            // {DAV:}quota-available-bytes
-            prop = propSet.get(DavPropertyName.create(PROPERTY_QUOTA_AVAILABLE_BYTES));
-            if (prop != null) {
-                String quotaAvailableBytesSt = (String) prop.getValue();
-                try {
-                    mQuotaAvailableBytes = new BigDecimal(quotaAvailableBytesSt);
-                } catch (NumberFormatException e) {
-                    Log_OC.w(TAG, "No value for QuotaAvailableBytes - NumberFormatException");
-                } catch (NullPointerException e) {
-                    Log_OC.w(TAG, "No value for QuotaAvailableBytes");
-                }
-                Log_OC.d(TAG, "QUOTA_AVAILABLE_BYTES " + quotaAvailableBytesSt);
-            }
-
-            // OC permissions property <oc:permissions>
-            prop = propSet.get(
-                EXTENDED_PROPERTY_NAME_PERMISSIONS, Namespace.getNamespace(NAMESPACE_OC)
-            );
-            if (prop != null && prop.getValue() != null) {
-                mPermissions = prop.getValue().toString();
-            }
-
-            // OC remote id property <oc:id>
-            prop = propSet.get(
-                EXTENDED_PROPERTY_NAME_REMOTE_ID, Namespace.getNamespace(NAMESPACE_OC)
-            );
-            if (prop != null) {
-                mRemoteId = prop.getValue().toString();
-            }
-
-            // OC size property <oc:size>
-            prop = propSet.get(
-                EXTENDED_PROPERTY_NAME_SIZE, Namespace.getNamespace(NAMESPACE_OC)
-            );
-            if (prop != null) {
-                mSize = Long.parseLong((String) prop.getValue());
-            }
-
-            // OC privatelink property <oc:privatelink>
-            prop = propSet.get(
-                EXTENDED_PROPERTY_NAME_PRIVATE_LINK, Namespace.getNamespace(NAMESPACE_OC)
-            );
-            if (prop != null) {
-                mPrivateLink = prop.getValue().toString();
-            }
-
-        } else {
-            Log_OC.e("WebdavEntry",
-                "General fuckup, no status for webdav response");
-        }
-    }
-
-    public String path() {
-        return mPath;
-    }
-
-    public String decodedPath() {
-        return Uri.decode(mPath);
-    }
-
-    public String name() {
-        return mName;
-    }
-
-    public boolean isDirectory() {
-        return mContentType.equals("DIR");
-    }
-
-    public String contentType() {
-        return mContentType;
-    }
-
-    public String uri() {
-        return mUri;
-    }
-
-    public long contentLength() {
-        return mContentLength;
-    }
-
-    public long createTimestamp() {
-        return mCreateTimestamp;
-    }
-
-    public long modifiedTimestamp() {
-        return mModifiedTimestamp;
-    }
-
-    public String etag() {
-        return mEtag;
-    }
-
-    public String permissions() {
-        return mPermissions;
-    }
-
-    public String remoteId() {
-        return mRemoteId;
-    }
-
-    public long size() {
-        return mSize;
-    }
-
-    public BigDecimal quotaUsedBytes() {
-        return mQuotaUsedBytes;
-    }
-
-    public BigDecimal quotaAvailableBytes() {
-        return mQuotaAvailableBytes;
-    }
-
-    public String privateLink() {
-        return mPrivateLink;
-    }
-
-    private void resetData() {
-        mName = mUri = mContentType = mPermissions = null;
-        mRemoteId = null;
-        mContentLength = mCreateTimestamp = mModifiedTimestamp = 0;
-        mSize = 0;
-        mQuotaUsedBytes = null;
-        mQuotaAvailableBytes = null;
-        mPrivateLink = null;
-    }
-}
diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
index eabd73e5..25f002dc 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -34,10 +34,6 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
-import org.apache.jackrabbit.webdav.property.DavPropertyName;
-import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
-import org.apache.jackrabbit.webdav.xml.Namespace;
-
 public class WebdavUtils {
     public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat(
             "dd.MM.yyyy hh:mm");
@@ -85,72 +81,6 @@ public class WebdavUtils {
         return encodedPath;
     }
 
-    /**
-     * Builds a DavPropertyNameSet with all prop
-     * For using instead of DavConstants.PROPFIND_ALL_PROP
-     * @return
-     */
-    public static DavPropertyNameSet getAllPropSet(){
-        DavPropertyNameSet propSet = new DavPropertyNameSet();
-        propSet.add(DavPropertyName.DISPLAYNAME);
-        propSet.add(DavPropertyName.GETCONTENTTYPE);
-        propSet.add(DavPropertyName.RESOURCETYPE);
-        propSet.add(DavPropertyName.GETCONTENTLENGTH);
-        propSet.add(DavPropertyName.GETLASTMODIFIED);
-        propSet.add(DavPropertyName.CREATIONDATE);
-        propSet.add(DavPropertyName.GETETAG);
-        propSet.add(DavPropertyName.create(WebdavEntry.PROPERTY_QUOTA_USED_BYTES));
-        propSet.add(DavPropertyName.create(WebdavEntry.PROPERTY_QUOTA_AVAILABLE_BYTES));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PERMISSIONS,
-                Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_REMOTE_ID,
-                Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE,
-                Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PRIVATE_LINK,
-            Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-
-        return propSet;
-    }
-
-    /**
-     * Builds a DavPropertyNameSet with properties for files
-     * @return
-     */
-    public static DavPropertyNameSet getFilePropSet(){
-        DavPropertyNameSet propSet = new DavPropertyNameSet();
-        propSet.add(DavPropertyName.DISPLAYNAME);
-        propSet.add(DavPropertyName.GETCONTENTTYPE);
-        propSet.add(DavPropertyName.RESOURCETYPE);
-        propSet.add(DavPropertyName.GETCONTENTLENGTH);
-        propSet.add(DavPropertyName.GETLASTMODIFIED);
-        propSet.add(DavPropertyName.CREATIONDATE);
-        propSet.add(DavPropertyName.GETETAG);
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PERMISSIONS,
-                Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_REMOTE_ID,
-                Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE,
-                Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE,
-            Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PRIVATE_LINK,
-            Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
-
-        return propSet;
-    }
-
-    /**
-     * Builds a DavPropertyNameSet with properties for user quotas
-     * @return set of quota properties
-     */
-    public static DavPropertyNameSet getQuotaPropSet() {
-        DavPropertyNameSet propSet = new DavPropertyNameSet();
-        propSet.add(DavPropertyName.create(WebdavEntry.PROPERTY_QUOTA_AVAILABLE_BYTES));
-        propSet.add(DavPropertyName.create(WebdavEntry.PROPERTY_QUOTA_USED_BYTES));
-        return propSet;
-    }
-
     /**
      *
      * @param rawEtag
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index c667ee1c..6b20f69a 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -33,11 +33,6 @@ import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-
-
-
-
-import org.apache.jackrabbit.webdav.DavException;
 import org.json.JSONException;
 
 import java.io.ByteArrayInputStream;
@@ -56,6 +51,7 @@ import java.util.Map;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLPeerUnverifiedException;
 
+import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import okhttp3.Headers;
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 73d44a5b..c675f803 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -27,10 +27,6 @@ package com.owncloud.android.lib.resources.files;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
-
-import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -189,21 +185,6 @@ public class RemoteFile implements Parcelable, Serializable {
         mRemotePath = path;
     }
 
-    public RemoteFile(WebdavEntry webdavEntry) {
-        this(webdavEntry.decodedPath());
-        this.setCreationTimestamp(webdavEntry.createTimestamp());
-        this.setLength(webdavEntry.contentLength());
-        this.setMimeType(webdavEntry.contentType());
-        this.setModifiedTimestamp(webdavEntry.modifiedTimestamp());
-        this.setEtag(webdavEntry.etag());
-        this.setPermissions(webdavEntry.permissions());
-        this.setRemoteId(webdavEntry.remoteId());
-        this.setSize(webdavEntry.size());
-        this.setQuotaUsedBytes(webdavEntry.quotaUsedBytes());
-        this.setQuotaAvailableBytes(webdavEntry.quotaAvailableBytes());
-        this.setPrivateLink(webdavEntry.privateLink());
-    }
-
     public RemoteFile(final DavResource davResource, String displayName) {
         this(getRemotePathFromUrl(davResource.getLocation(), displayName));
         final PropertyCollection properties = davResource.getProperties();

From 0b9a79491fb778806faea4cb49571a9e9d126636 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 28 Jun 2018 13:57:48 +0200
Subject: [PATCH 087/133] Upload chunks

---
 .../network/ChunkFromFileRequestBody.java     | 35 ++++++++++++++++---
 .../lib/common/network/FileRequestBody.java   | 10 ++++++
 .../ChunkedUploadRemoteFileOperation.java     |  5 ++-
 .../files/CreateRemoteFolderOperation.java    |  2 +-
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
index 2639217b..e78fd153 100644
--- a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
+++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
@@ -24,8 +24,11 @@
 
 package com.owncloud.android.lib.common.network;
 
+import android.util.Log;
+
+import com.owncloud.android.lib.common.utils.Log_OC;
+
 import java.io.File;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Iterator;
@@ -33,9 +36,14 @@ import java.util.Iterator;
 import okhttp3.MediaType;
 import okio.BufferedSink;
 
+/**
+ * A Request body that represents a file chunk and include information about the progress when uploading it
+ *
+ * @author David González Verdugo
+ */
 public class ChunkFromFileRequestBody extends FileRequestBody {
 
-    private static final String TAG = ChunkFromFileChannelRequestEntity.class.getSimpleName();
+    private static final String TAG = ChunkFromFileRequestBody.class.getSimpleName();
 
     //private final File mFile;
     private final FileChannel mChannel;
@@ -58,6 +66,10 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
         mTransferred = 0;
     }
 
+    @Override
+    public long contentLength() {
+        return mChunkSize;
+    }
 
     @Override
     public void writeTo(BufferedSink sink) {
@@ -70,8 +82,19 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
             if (size == 0) size = -1;
             long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
             while (mChannel.position() < maxCount) {
+
+                Log_OC.d(TAG, "Sink buffer size: " + sink.buffer().size());
+
                 readCount = mChannel.read(mBuffer);
-                sink.write(mBuffer.array(), 0 ,readCount);
+
+                Log_OC.d(TAG, "Read " + readCount + " bytes from file channel to " + mBuffer.toString());
+
+                sink.buffer().write(mBuffer.array(), 0 ,readCount);
+
+                sink.flush();
+
+                Log_OC.d(TAG, "Write " + readCount + " bytes to sink buffer with size " + sink.buffer().size());
+
                 mBuffer.clear();
                 if (mTransferred < maxCount) {  // condition to avoid accumulate progress for repeated chunks
                     mTransferred += readCount;
@@ -84,9 +107,11 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
                 }
             }
 
-            sink.flush();
+            Log.d(TAG, "Chunk with size " + mChunkSize + " written in request body");
 
-        } catch (IOException io) {
+        } catch (Exception exception) {
+
+            Log.e(TAG, exception.toString());
 //            // any read problem will be handled as if the file is not there
 //            if (io instanceof FileNotFoundException) {
 //                throw io;
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
index bec7f041..56575827 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestBody.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestBody.java
@@ -24,6 +24,10 @@
 
 package com.owncloud.android.lib.common.network;
 
+import android.util.Log;
+
+import com.owncloud.android.lib.common.utils.Log_OC;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.HashSet;
@@ -43,6 +47,8 @@ import okio.Source;
  */
 public class FileRequestBody extends RequestBody implements ProgressiveDataTransferer {
 
+    private static final String TAG = FileRequestBody.class.getSimpleName();
+
     protected File mFile;
     private MediaType mContentType;
     Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
@@ -68,6 +74,7 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans
         Iterator<OnDatatransferProgressListener> it;
         try {
             source = Okio.source(mFile);
+
             long transferred = 0;
             long read;
 
@@ -82,6 +89,9 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans
                 }
             }
 
+            Log.d(TAG, "File with name " + mFile.getName() + " and size " + mFile.length() +
+                    " written in request body");
+
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index df454407..7b12df8a 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -106,11 +106,10 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                 if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
                     mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
                 }
-//                mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
-//                mPutMethod.addRequestHeader(OC_CHUNK_SIZE_HEADER, chunkSizeStr);
+
                 mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
 
-                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+//                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
 
 //                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
 //                mPutMethod.setRequestEntity(mEntity);
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 798d9d51..ae4a0034 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -77,7 +77,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
      */
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
         OwnCloudVersion version = client.getOwnCloudVersion();
         boolean versionWithForbiddenChars =
             (version != null && version.isVersionWithForbiddenCharacters());

From e6bdfab11a438719ae8a195f9d2b94e06cfae206 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 29 Jun 2018 10:37:58 +0200
Subject: [PATCH 088/133] make redirect more or less work

---
 .../android/lib/common/OwnCloudClient.java    | 78 +++++++++----------
 .../OwnCloudSamlSsoCredentials.java           |  5 --
 .../android/lib/common/http/HttpClient.java   |  7 +-
 3 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 46b339d0..12bf18a9 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -25,7 +25,6 @@
 
 package com.owncloud.android.lib.common;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.content.Context;
@@ -37,7 +36,6 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
-import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
@@ -45,9 +43,9 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
 
+import at.bitfire.dav4android.exception.HttpException;
 import okhttp3.Cookie;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
@@ -136,9 +134,16 @@ public class OwnCloudClient extends HttpClient {
         int status;
 
         do {
-            //TODO Dav4Android doesn't allow follow redirections right now
-//            method.setFollowRedirects(mFollowRedirects);
-            status = method.execute();
+            try {
+                status = method.execute();
+            } catch (HttpException e) {
+                if(e.getMessage().contains(Integer.toString(HttpConstants.HTTP_MOVED_TEMPORARILY))) {
+                    status = followRedirection(method).getLastStatus();
+                } else {
+                    throw e;
+                }
+            }
+
             repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
             if (repeatWithFreshCredentials) {
                 repeatCounter++;
@@ -148,41 +153,26 @@ public class OwnCloudClient extends HttpClient {
         return status;
     }
 
-    private void checkFirstRedirection(HttpMethod method) {
-        final String location = method.getResponseHeaders()
-                .get("location");
+    private int executeRedirectedHttpMethod (HttpBaseMethod method) throws Exception {
+        boolean repeatWithFreshCredentials;
+        int repeatCounter = 0;
+        int status;
 
-        if(location != null && !location.isEmpty()) {
-            mRedirectedLocation = location;
-        }
+        do {
+            status = method.execute();
+
+            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
+            if (repeatWithFreshCredentials) {
+                repeatCounter++;
+            }
+        } while (repeatWithFreshCredentials);
+
+        return status;
     }
 
-    /**
-     * Fix for https://github.com/owncloud/android/issues/1847#issuecomment-267558274
-     *
-     * The problem: default SocketFactory in HTTPClient 3.x for HTTP connections creates a separate thread
-     * to create the socket. When a port out of TCP bounds is passed, an exception is thrown in that
-     * separate thread, and our original thread is not able to catch it. This is not happenning with HTTPS
-     * connections because we had to define our own socket factory,
-     * {@link com.owncloud.android.lib.common.network.AdvancedSslSocketFactory}, and it does not mess with
-     * threads.
-     *
-     * The solution: validate the input (the port number) ourselves before let the work to HTTPClient 3.x.
-     *
-     * @param method HTTP method to run.
-     * @throws IllegalArgumentException If 'method' targets an invalid port in an HTTP URI.
-     */
-    private void preventCrashDueToInvalidPort(HttpMethod method) {
-        final int port = method.getUrl().port();
-        String scheme = method.getUrl().scheme().toLowerCase();
-        if ("http".equals(scheme) && port > 0xFFFF) {
-            // < 0 is not tested because -1 is used when no port number is specified in the URL;
-            // no problem, the network library will convert that in the default HTTP port
-            throw new IllegalArgumentException("Invalid port number " + port);
-        }
-    }
 
-    public RedirectionPath followRedirection(HttpMethod method) throws Exception {
+
+    public RedirectionPath followRedirection(HttpBaseMethod method) throws Exception {
         int redirectionsCount = 0;
         int status = method.getStatusCode();
         RedirectionPath result = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
@@ -215,13 +205,19 @@ public class OwnCloudClient extends HttpClient {
                 if (destination != null) {
                     final int suffixIndex = location.lastIndexOf(WEBDAV_PATH_4_0);
                     final String redirectionBase = location.substring(0, suffixIndex);
-
                     final String destinationPath = destination.substring(mBaseUri.toString().length());
-                    final String redirectedDestination = redirectionBase + destinationPath;
 
-                    method.setRequestHeader("destination", destination);
+                    method.setRequestHeader("destination", redirectionBase + destinationPath);
+                }
+                try {
+                    status = executeRedirectedHttpMethod(method);
+                } catch (HttpException e) {
+                    if(e.getMessage().contains(Integer.toString(HttpConstants.HTTP_MOVED_TEMPORARILY))) {
+                        status = HttpConstants.HTTP_MOVED_TEMPORARILY;
+                    } else  {
+                        throw e;
+                    }
                 }
-                status = executeHttpMethod(method);
                 result.addStatus(status);
                 redirectionsCount++;
 
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 40d4c785..245bfa1c 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -23,10 +23,6 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-
-
-import android.net.Uri;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
@@ -36,7 +32,6 @@ import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
 
 import java.util.ArrayList;
 
-import okhttp3.Cookie;
 
 public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index df4c52b2..2ff2a100 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -58,9 +58,6 @@ public class HttpClient {
     private static HttpInterceptor sOkHttpInterceptor;
     private static Context sContext;
 
-    public HttpClient() {
-
-    }
 
     public static void setContext(Context context) {
         sContext = context;
@@ -78,7 +75,9 @@ public class HttpClient {
                         .protocols(Arrays.asList(Protocol.HTTP_1_1))
                         .followRedirects(false)
                         .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
-                        .hostnameVerifier(new BrowserCompatHostnameVerifier());
+                        .hostnameVerifier((asdf, usdf) -> true);
+                        // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
+                        //.hostnameVerifier(new BrowserCompatHostnameVerifier());
                 if(BuildConfig.DEBUG) {
                     clientBuilder.addNetworkInterceptor(new StethoInterceptor());
                 }

From 762ae7eb62a2b0280c754e845940d4541abfd456 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 29 Jun 2018 14:00:59 +0200
Subject: [PATCH 089/133] Move file after upload with chunks

---
 .../lib/resources/files/FileUtils.java        |  1 +
 .../files/MoveRemoteChunksFileOperation.java  | 16 ++++++++++++++
 .../files/MoveRemoteFileOperation.java        | 22 ++++++++++++-------
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java

diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/src/com/owncloud/android/lib/resources/files/FileUtils.java
index 2bca03b4..8825dfc3 100644
--- a/src/com/owncloud/android/lib/resources/files/FileUtils.java
+++ b/src/com/owncloud/android/lib/resources/files/FileUtils.java
@@ -34,6 +34,7 @@ public class FileUtils {
 	private static final  String TAG = FileUtils.class.getSimpleName();
 
 	public static final String PATH_SEPARATOR = "/";
+	public static final String FINAl_CHUNKS_FILE = ".file";
 
 	public static String getParentPath(String remotePath) {
 		String parentPath = new File(remotePath).getParent();
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
new file mode 100644
index 00000000..0663b0e6
--- /dev/null
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
@@ -0,0 +1,16 @@
+package com.owncloud.android.lib.resources.files;
+
+public class MoveRemoteChunksFileOperation extends MoveRemoteFileOperation {
+
+    /**
+     * Constructor.
+     *
+     * @param srcRemotePath    Remote path of the file/folder to move.
+     * @param targetRemotePath Remove path desired for the file/folder after moving it.
+     * @param overwrite
+     */
+    public MoveRemoteChunksFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite) {
+        super(srcRemotePath, targetRemotePath, overwrite);
+        isChunkedFile = true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 180830ae..6a639ce3 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 
 package com.owncloud.android.lib.resources.files;
 
+import android.net.Uri;
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -43,10 +44,11 @@ import okhttp3.HttpUrl;
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
  * in the same account.
- * <p>
+ *
  * Allows renaming the moving file/folder at the same time.
  *
  * @author David A. Velasco
+ * @author David González Verdugo
  */
 public class MoveRemoteFileOperation extends RemoteOperation {
 
@@ -59,7 +61,7 @@ public class MoveRemoteFileOperation extends RemoteOperation {
     private String mTargetRemotePath;
 
     private boolean mOverwrite;
-
+    protected boolean isChunkedFile;
 
     /**
      * Constructor.
@@ -76,6 +78,7 @@ public class MoveRemoteFileOperation extends RemoteOperation {
         mSrcRemotePath = srcRemotePath;
         mTargetRemotePath = targetRemotePath;
         mOverwrite = overwrite;
+        isChunkedFile = false;
     }
 
 
@@ -106,10 +109,15 @@ public class MoveRemoteFileOperation extends RemoteOperation {
         }
 
         /// perform remote operation
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
         try {
+
+            // After finishing a chunked upload, we have to move the resulting file from uploads folder to files one,
+            // so this uri has to be customizable
+            Uri srcWebDavUri = isChunkedFile ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
+
             final MoveMethod move = new MoveMethod(
-                    HttpUrl.parse( client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
+                    HttpUrl.parse(srcWebDavUri + WebdavUtils.encodePath(mSrcRemotePath)),
                 client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
@@ -126,7 +134,6 @@ public class MoveRemoteFileOperation extends RemoteOperation {
                 result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
                 client.exhaustResponse(move.getResponseAsStream());
 
-
                 /// for other errors that could be explicitly handled, check first:
                 /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
 
@@ -151,5 +158,4 @@ public class MoveRemoteFileOperation extends RemoteOperation {
     protected boolean isSuccess(int status) {
         return status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT;
     }
-
-}
+}
\ No newline at end of file

From ed073d6db0924d5f289092139b3198e01cfffe7a Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 2 Jul 2018 10:08:12 +0200
Subject: [PATCH 090/133] Add timeout to last chunk

---
 .../files/ChunkedUploadRemoteFileOperation.java     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 7b12df8a..1fc402bd 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -35,6 +35,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.MediaType;
 
@@ -118,12 +119,12 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 //                    // next method will throw an exception
 //                }
 
-//                if (chunkIndex == chunkCount - 1) {
-//                    // Added a high timeout to the last chunk due to when the last chunk
-//                    // arrives to the server with the last PUT, all chunks get assembled
-//                    // within that PHP request, so last one takes longer.
-//                    mPutMethod.getParams().setSoTimeout(LAST_CHUNK_TIMEOUT);
-//                }
+                if (chunkIndex == chunkCount - 1) {
+                    // Added a high timeout to the last chunk due to when the last chunk
+                    // arrives to the server with the last PUT, all chunks get assembled
+                    // within that PHP request, so last one takes longer.
+                    mPutMethod.setReadTimeout(LAST_CHUNK_TIMEOUT, TimeUnit.MILLISECONDS);
+                }
 
                 mPutMethod.setRequestBody(mFileRequestBody);
 

From 1d80067f858cbdf3838c1bb3f3b55cdd060cc906 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 2 Jul 2018 15:39:15 +0200
Subject: [PATCH 091/133] Refactor interceptors and include move headers

---
 .../OwnCloudBasicCredentials.java             | 36 ++++------------
 .../OwnCloudBearerCredentials.java            | 32 ++++----------
 .../OwnCloudCredentialsFactory.java           | 24 +++--------
 .../OwnCloudSamlSsoCredentials.java           | 31 ++++---------
 .../android/lib/common/http/HttpClient.java   | 33 +++++++++-----
 .../lib/common/http/HttpConstants.java        |  8 ++--
 .../interceptors/BarearAuthInterceptor.java   | 21 ---------
 .../interceptors/BasicAuthInterceptor.java    | 43 -------------------
 .../http/interceptors/HttpInterceptor.java    | 25 ++++++++++-
 .../RequestHeaderInterceptor.java             | 27 ++++++++++++
 .../interceptors/SamlAuthInterceptor.java     | 21 ---------
 .../interceptors/UserAgentInterceptor.java    | 42 ------------------
 .../common/http/methods/HttpBaseMethod.java   |  2 -
 .../common/http/methods/webdav/DavMethod.java |  1 +
 .../ChunkedUploadRemoteFileOperation.java     | 16 +------
 .../lib/resources/files/FileUtils.java        |  2 +-
 .../files/MoveRemoteChunksFileOperation.java  |  5 ++-
 .../files/MoveRemoteFileOperation.java        | 22 ++++++----
 18 files changed, 127 insertions(+), 264 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java
 delete mode 100644 src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
 create mode 100644 src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java
 delete mode 100644 src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java
 delete mode 100644 src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java

diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 8fce943d..19ad1a59 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -25,20 +25,9 @@ package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
+import com.owncloud.android.lib.common.http.HttpConstants;
 
-
-
-
-
-
-
-import java.util.ArrayList;
-import java.util.List;
+import okhttp3.Credentials;
 
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
@@ -62,21 +51,13 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
     @Override
     public void applyTo(OwnCloudClient client) {
-        ArrayList<RequestInterceptor> requestInterceptors = HttpClient.getOkHttpInterceptor().getRequestInterceptors();
-
         // Clear previous basic credentials
-        for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
-            if (requestInterceptor instanceof BasicAuthInterceptor
-                    || requestInterceptor instanceof BarearAuthInterceptor
-                    || requestInterceptor instanceof SamlAuthInterceptor) {
-                requestInterceptors.remove(requestInterceptor);
-            }
-        }
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
-        HttpClient.getOkHttpInterceptor()
-                .addRequestInterceptor(
-                        new BasicAuthInterceptor(mUsername, mPassword)
-                );
+        HttpClient.addHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER,
+                Credentials.basic(mUsername, mPassword));
     }
 
     @Override
@@ -98,5 +79,4 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
     public boolean authTokenCanBeRefreshed() {
         return false;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
index 2f44f12e..f3d1ec08 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -23,15 +23,9 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-import java.util.ArrayList;
-
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
+import com.owncloud.android.lib.common.http.HttpConstants;
 
 public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
@@ -45,21 +39,12 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 
     @Override
     public void applyTo(OwnCloudClient client) {
+        // Clear previous credentials
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
-        final ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors =
-                HttpClient.getOkHttpInterceptor().getRequestInterceptors();
-
-        // Clear previous basic credentials
-        for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
-            if (requestInterceptor instanceof BasicAuthInterceptor
-                || requestInterceptor instanceof BarearAuthInterceptor
-                || requestInterceptor instanceof SamlAuthInterceptor) {
-                    requestInterceptors.remove(requestInterceptor);
-            }
-        }
-
-        HttpClient.getOkHttpInterceptor()
-                .addRequestInterceptor(new BarearAuthInterceptor(mAccessToken));
+        HttpClient.addHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER, mAccessToken);
     }
 
     @Override
@@ -82,5 +67,4 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
     public boolean authTokenCanBeRefreshed() {
         return true;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
index f22e06d8..1049d1e5 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,12 +26,7 @@ package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
-
-import java.util.ArrayList;
+import com.owncloud.android.lib.common.http.HttpConstants;
 
 public class OwnCloudCredentialsFactory {
 
@@ -71,16 +66,10 @@ public class OwnCloudCredentialsFactory {
 
         @Override
         public void applyTo(OwnCloudClient client) {
-            ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors = HttpClient.getOkHttpInterceptor().getRequestInterceptors();
-
             // Clear previous basic credentials
-            for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
-                if (requestInterceptor instanceof BasicAuthInterceptor
-                        || requestInterceptor instanceof BarearAuthInterceptor
-                        || requestInterceptor instanceof SamlAuthInterceptor) {
-                    requestInterceptors.remove(requestInterceptor);
-                }
-            }
+            HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
+            HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+            HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
         }
 
         @Override
@@ -104,5 +93,4 @@ public class OwnCloudCredentialsFactory {
             return null;
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 245bfa1c..30d5d504 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +25,7 @@ package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.SamlAuthInterceptor;
-
-import java.util.ArrayList;
-
+import com.owncloud.android.lib.common.http.HttpConstants;
 
 public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 
@@ -45,20 +39,12 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 
     @Override
     public void applyTo(OwnCloudClient client) {
-        final ArrayList<HttpInterceptor.RequestInterceptor> requestInterceptors =
-                HttpClient.getOkHttpInterceptor().getRequestInterceptors();
+        // Clear previous credentials
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
-        // Clear previous basic credentials
-        for (HttpInterceptor.RequestInterceptor requestInterceptor : requestInterceptors) {
-            if (requestInterceptor instanceof BasicAuthInterceptor
-                    || requestInterceptor instanceof BarearAuthInterceptor
-                    || requestInterceptor instanceof SamlAuthInterceptor) {
-                requestInterceptors.remove(requestInterceptor);
-            }
-        }
-
-        HttpClient.getOkHttpInterceptor()
-                .addRequestInterceptor(new SamlAuthInterceptor(mSessionCookie));
+        HttpClient.addHeaderForAllRequests(HttpConstants.COOKIE_HEADER, mSessionCookie);
     }
 
     @Override
@@ -81,5 +67,4 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
     public boolean authTokenCanBeRefreshed() {
         return false;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 2ff2a100..4aa51922 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -25,19 +25,19 @@
 package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
+
+import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import com.facebook.stetho.okhttp3.StethoInterceptor;
 import com.owncloud.android.lib.BuildConfig;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.RequestHeaderInterceptor;
 import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
-
 import java.util.Arrays;
 
 import javax.net.ssl.SSLContext;
@@ -58,7 +58,6 @@ public class HttpClient {
     private static HttpInterceptor sOkHttpInterceptor;
     private static Context sContext;
 
-
     public static void setContext(Context context) {
         sContext = context;
     }
@@ -90,14 +89,10 @@ public class HttpClient {
         return sOkHttpClient;
     }
 
-    public static HttpInterceptor getOkHttpInterceptor() {
+    private static HttpInterceptor getOkHttpInterceptor() {
         if (sOkHttpInterceptor == null) {
-            sOkHttpInterceptor = new HttpInterceptor()
-                    .addRequestInterceptor(new UserAgentInterceptor(
-                                    // TODO Try to get rid of this dependency
-                                    OwnCloudClientManagerFactory.getUserAgent()
-                            )
-                    );
+            sOkHttpInterceptor = new HttpInterceptor();
+            addHeaderForAllRequests(HttpConstants.USER_AGENT_HEADER, OwnCloudClientManagerFactory.getUserAgent());
         }
         return sOkHttpInterceptor;
     }
@@ -118,4 +113,20 @@ public class HttpClient {
         }
         sOkHttpClient = clientBuilder.build();
     }
+
+    /**
+     * Add header that will be included for all the requests from now on
+     * @param headerName
+     * @param headerValue
+     */
+    public static void addHeaderForAllRequests(String headerName, String headerValue) {
+        getOkHttpInterceptor()
+                .addRequestInterceptor(
+                        new RequestHeaderInterceptor(headerName, headerValue)
+                );
+    }
+
+    public static void deleteHeaderForAllRequests(String headerName) {
+        getOkHttpInterceptor().deleteRequestHeaderInterceptor(headerName);
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 76321402..86e39df7 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -33,10 +33,10 @@ public class HttpConstants {
      *************************************************** HEADERS ***********************************************
      ***********************************************************************************************************/
 
-    /***********************************************************************************************************
-     *************************************************** HEADERS ***********************************************
-     ***********************************************************************************************************/
-
+    public static final String BASIC_AUTHORIZATION_HEADER = "Authorization";
+    public static final String COOKIE_HEADER = "Cookie";
+    public static final String BEARER_AUTHORIZATION_HEADER = "Bearer ";
+    public static final String USER_AGENT_HEADER = "User-Agent";
     public static final String IF_MATCH_HEADER = "If-Match";
     public static final String IF_NONE_MATCH_HEADER = "If-None-Match";
     public static final String CONTENT_TYPE_HEADER = "Content-Type";
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java
deleted file mode 100644
index 4cf1f23d..00000000
--- a/src/com/owncloud/android/lib/common/http/interceptors/BarearAuthInterceptor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.owncloud.android.lib.common.http.interceptors;
-
-import okhttp3.Request;
-
-public class BarearAuthInterceptor implements HttpInterceptor.RequestInterceptor {
-
-    private static final String AUTHORIZATION_HEADER = "Authorization";
-    private final String mBarearToken;
-
-    public BarearAuthInterceptor(String barearToken) {
-        this.mBarearToken = barearToken;
-    }
-
-    @Override
-    public Request intercept(Request request) {
-        return request
-                .newBuilder()
-                .addHeader(AUTHORIZATION_HEADER, "Bearer " + mBarearToken)
-                .build();
-    }
-}
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
deleted file mode 100644
index a61a33fd..00000000
--- a/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.http.interceptors;
-
-import okhttp3.Credentials;
-import okhttp3.Request;
-
-public class BasicAuthInterceptor implements HttpInterceptor.RequestInterceptor {
-
-    private static final String AUTHORIZATION_HEADER = "Authorization";
-    private String mCredentials;
-
-    public BasicAuthInterceptor(String username, String password) {
-        mCredentials = Credentials.basic(username, password);
-    }
-
-    @Override
-    public Request intercept(Request request) {
-        return request.newBuilder().addHeader(AUTHORIZATION_HEADER, mCredentials).build();
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
index 95d06506..4613fe6b 100644
--- a/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
@@ -65,7 +65,7 @@ public class HttpInterceptor implements Interceptor {
         Response intercept(Response response) throws IOException;
     }
 
-    public HttpInterceptor addRequestInterceptor (RequestInterceptor requestInterceptor) {
+    public HttpInterceptor addRequestInterceptor(RequestInterceptor requestInterceptor) {
         mRequestInterceptors.add(requestInterceptor);
         return this;
     }
@@ -79,7 +79,28 @@ public class HttpInterceptor implements Interceptor {
         return mRequestInterceptors;
     }
 
+    private ArrayList<RequestHeaderInterceptor> getRequestHeaderInterceptors() {
+        ArrayList<RequestHeaderInterceptor> requestHeaderInterceptors = new ArrayList<>();
+
+        for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
+            if (requestInterceptor instanceof RequestHeaderInterceptor) {
+                requestHeaderInterceptors.add((RequestHeaderInterceptor) requestInterceptor);
+            }
+        }
+
+        return requestHeaderInterceptors;
+    }
+
+    public void deleteRequestHeaderInterceptor(String headerName) {
+        for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
+            if (requestInterceptor instanceof RequestHeaderInterceptor &&
+                    ((RequestHeaderInterceptor) requestInterceptor).getHeaderName().equals(headerName)) {
+                mRequestInterceptors.remove(requestInterceptor);
+            }
+        }
+    }
+
     public ArrayList<ResponseInterceptor> getResponseInterceptors() {
         return mResponseInterceptors;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java
new file mode 100644
index 00000000..a7b31c26
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java
@@ -0,0 +1,27 @@
+package com.owncloud.android.lib.common.http.interceptors;
+
+import okhttp3.Request;
+
+public class RequestHeaderInterceptor implements HttpInterceptor.RequestInterceptor {
+
+    private String mHeaderName;
+    private String mHeaderValue;
+
+    public RequestHeaderInterceptor(String headerName, String headerValue) {
+        this.mHeaderName = headerName;
+        this.mHeaderValue = headerValue;
+    }
+
+    @Override
+    public Request intercept(Request request) {
+        return request.newBuilder().addHeader(mHeaderName, mHeaderValue).build();
+    }
+
+    public String getHeaderName() {
+        return mHeaderName;
+    }
+
+    public String getHeaderValue() {
+        return mHeaderValue;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java
deleted file mode 100644
index 8651456e..00000000
--- a/src/com/owncloud/android/lib/common/http/interceptors/SamlAuthInterceptor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.owncloud.android.lib.common.http.interceptors;
-
-import java.io.IOException;
-
-import okhttp3.Request;
-
-public class SamlAuthInterceptor implements HttpInterceptor.RequestInterceptor {
-
-    private final String mSessionCookie;
-
-    public SamlAuthInterceptor(String sessionCookie) {
-        this.mSessionCookie = sessionCookie;
-    }
-
-    @Override
-    public Request intercept(Request request) throws IOException {
-        return request.newBuilder()
-                .addHeader("Cookie", mSessionCookie)
-                .build();
-    }
-}
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java
deleted file mode 100644
index b57b4fed..00000000
--- a/src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.http.interceptors;
-
-import okhttp3.Request;
-
-public class UserAgentInterceptor implements HttpInterceptor.RequestInterceptor {
-
-    private static final String USER_AGENT_HEADER = "User-Agent";
-    private String mUserAgent;
-
-    public UserAgentInterceptor(String userAgent) {
-        mUserAgent = userAgent;
-    }
-
-    @Override
-    public Request intercept(Request request) {
-        return request.newBuilder().addHeader(USER_AGENT_HEADER, mUserAgent).build();
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 00ac6d6f..f03ae1c1 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -60,8 +60,6 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
-
-
     public void abort() {
         mCall.cancel();
     }
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index 70ee38b2..7c5c0332 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -24,6 +24,7 @@
 
 package com.owncloud.android.lib.common.http.methods.webdav;
 
+import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 1fc402bd..00ead627 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -54,16 +54,13 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
     private static final int LAST_CHUNK_TIMEOUT = 900000; //15 mins.
 
     public static final long CHUNK_SIZE = 1024000;
-    private static final String OC_CHUNKED_HEADER = "OC-Chunked";
-    private static final String OC_CHUNK_SIZE_HEADER = "OC-Chunk-Size";
-    private static final String OC_CHUNK_X_OC_MTIME_HEADER = "X-OC-Mtime";
     private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();
 
     private long mTransferId;
 
-    public ChunkedUploadRemoteFileOperation(long transferId, String storagePath, String remotePath, String mimeType,
+    public ChunkedUploadRemoteFileOperation(long transferId, String localPath, String remotePath, String mimeType,
                                             String requiredEtag, String fileLastModifTimestamp) {
-        super(storagePath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
+        super(localPath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
         mTransferId = transferId;
     }
 
@@ -92,14 +89,9 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
             String uriPrefix = client.getNewUploadsWebDavUri() + FileUtils.PATH_SEPARATOR + String.valueOf(mTransferId);
             long totalLength = fileToUpload.length();
             long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-            String chunkSizeStr = String.valueOf(CHUNK_SIZE);
             String totalLengthStr = String.valueOf(fileToUpload.length());
 
             for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
-                if (chunkIndex == chunkCount - 1) {
-                    chunkSizeStr = String.valueOf(CHUNK_SIZE * chunkCount - totalLength);
-                }
-
                 mPutMethod = new PutMethod(
                         HttpUtils.stringUrlToHttpUrl(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
                 );
@@ -108,10 +100,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                     mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
                 }
 
-                mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
-
-//                mPutMethod.addRequestHeader(OC_CHUNK_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
-
 //                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
 //                mPutMethod.setRequestEntity(mEntity);
 //                if (mCancellationRequested.get()) {
diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/src/com/owncloud/android/lib/resources/files/FileUtils.java
index 8825dfc3..71277b44 100644
--- a/src/com/owncloud/android/lib/resources/files/FileUtils.java
+++ b/src/com/owncloud/android/lib/resources/files/FileUtils.java
@@ -34,7 +34,7 @@ public class FileUtils {
 	private static final  String TAG = FileUtils.class.getSimpleName();
 
 	public static final String PATH_SEPARATOR = "/";
-	public static final String FINAl_CHUNKS_FILE = ".file";
+	public static final String FINAL_CHUNKS_FILE = ".file";
 
 	public static String getParentPath(String remotePath) {
 		String parentPath = new File(remotePath).getParent();
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
index 0663b0e6..7c8859de 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
@@ -9,8 +9,11 @@ public class MoveRemoteChunksFileOperation extends MoveRemoteFileOperation {
      * @param targetRemotePath Remove path desired for the file/folder after moving it.
      * @param overwrite
      */
-    public MoveRemoteChunksFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite) {
+    public MoveRemoteChunksFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite,
+                                         String fileLastModifTimestamp, long fileLength) {
         super(srcRemotePath, targetRemotePath, overwrite);
         isChunkedFile = true;
+        mFileLastModifTimestamp = fileLastModifTimestamp;
+        mFileLength = fileLength;
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 6a639ce3..2ec989ca 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit;
 
 import okhttp3.HttpUrl;
 
-
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
  * in the same account.
@@ -59,21 +58,23 @@ public class MoveRemoteFileOperation extends RemoteOperation {
 
     private String mSrcRemotePath;
     private String mTargetRemotePath;
-
     private boolean mOverwrite;
+
     protected boolean isChunkedFile;
+    protected String mFileLastModifTimestamp;
+    protected long mFileLength;
 
     /**
      * Constructor.
-     * <p>
+     *
      * TODO Paths should finish in "/" in the case of folders. ?
      *
      * @param srcRemotePath    Remote path of the file/folder to move.
-     * @param targetRemotePath Remove path desired for the file/folder after moving it.
+     * @param targetRemotePath Remote path desired for the file/folder after moving it.
      */
-    public MoveRemoteFileOperation(
-        String srcRemotePath, String targetRemotePath, boolean overwrite
-    ) {
+    public MoveRemoteFileOperation(String srcRemotePath,
+                                   String targetRemotePath,
+                                   boolean overwrite) {
 
         mSrcRemotePath = srcRemotePath;
         mTargetRemotePath = targetRemotePath;
@@ -81,7 +82,6 @@ public class MoveRemoteFileOperation extends RemoteOperation {
         isChunkedFile = false;
     }
 
-
     /**
      * Performs the rename operation.
      *
@@ -121,6 +121,11 @@ public class MoveRemoteFileOperation extends RemoteOperation {
                 client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
+            if (isChunkedFile) {
+                move.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
+                move.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(mFileLength));
+            }
+
             move.setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS);
             move.setConnectionTimeout(MOVE_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
 
@@ -149,7 +154,6 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             result = new RemoteOperationResult(e);
             Log.e(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
                 result.getLogMessage(), e);
-
         }
 
         return result;

From c8a0451e0656c7f0d741017d1ffe7d8766512d04 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 3 Jul 2018 10:57:58 +0200
Subject: [PATCH 092/133] Implement move method and finish basic chunked
 uploads

---
 .../lib/common/http/methods/webdav/MoveMethod.java   |  9 ++++++++-
 .../lib/common/network/ChunkFromFileRequestBody.java | 12 +++++++++++-
 .../files/ChunkedUploadRemoteFileOperation.java      | 11 +++--------
 .../files/ExistenceCheckRemoteOperation.java         |  4 ++--
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
index 45012af2..48861c6b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
@@ -1,5 +1,7 @@
 package com.owncloud.android.lib.common.http.methods.webdav;
 
+import com.owncloud.android.lib.common.http.HttpConstants;
+
 import at.bitfire.dav4android.exception.UnauthorizedException;
 import okhttp3.HttpUrl;
 
@@ -16,7 +18,12 @@ public class MoveMethod extends DavMethod {
     @Override
     public int execute() throws Exception {
         try {
-            mDavResource.move(destinationUrl, forceOverride);
+            mDavResource.move(
+                    destinationUrl,
+                    forceOverride,
+                    super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
+                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER)
+            );
 
             mRequest = mDavResource.getRequest();
             mResponse = mDavResource.getResponse();
diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
index e78fd153..63ee682f 100644
--- a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
+++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
@@ -29,6 +29,7 @@ import android.util.Log;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Iterator;
@@ -68,7 +69,11 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
 
     @Override
     public long contentLength() {
-        return mChunkSize;
+        try {
+            return Math.min(mChunkSize, mChannel.size() - mChannel.position());
+        } catch (IOException e) {
+            return mChunkSize;
+        }
     }
 
     @Override
@@ -83,6 +88,7 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
             long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
             while (mChannel.position() < maxCount) {
 
+
                 Log_OC.d(TAG, "Sink buffer size: " + sink.buffer().size());
 
                 readCount = mChannel.read(mBuffer);
@@ -122,4 +128,8 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
 //            }
         }
     }
+
+    public void setOffset(long offset) {
+        this.mOffset = offset;
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 00ead627..2da93b78 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -52,7 +52,6 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
 public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
 
     private static final int LAST_CHUNK_TIMEOUT = 900000; //15 mins.
-
     public static final long CHUNK_SIZE = 1024000;
     private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();
 
@@ -66,9 +65,8 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 
     @Override
     protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
-        int status = -1;
+        int status;
         RemoteOperationResult result = null;
-
         FileChannel channel = null;
         RandomAccessFile raf = null;
 
@@ -89,7 +87,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
             String uriPrefix = client.getNewUploadsWebDavUri() + FileUtils.PATH_SEPARATOR + String.valueOf(mTransferId);
             long totalLength = fileToUpload.length();
             long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-            String totalLengthStr = String.valueOf(fileToUpload.length());
 
             for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
                 mPutMethod = new PutMethod(
@@ -100,8 +97,8 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                     mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
                 }
 
-//                ((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
-//                mPutMethod.setRequestEntity(mEntity);
+                ((ChunkFromFileRequestBody) mFileRequestBody).setOffset(offset);
+
 //                if (mCancellationRequested.get()) {
 //                    mPutMethod.abort();
 //                    // next method will throw an exception
@@ -137,8 +134,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                 channel.close();
             if (raf != null)
                 raf.close();
-//            if (mPutMethod != null)
-//                mPutMethod.releaseConnection();    // let the connection available for other methods
         }
         return result;
     }
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index cc6da844..456a7425 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -115,14 +115,14 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     ? new RemoteOperationResult(OK)
                     : new RemoteOperationResult(propfindMethod);
 
-            Log_OC.d(TAG, "Existence check for " + client.getOldFilesWebdavUri() +
+            Log_OC.d(TAG, "Existence check for " + client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
                     "finished with HTTP status " + status + (!isSuccess(status) ? "(FAIL)" : ""));
 
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Existence check for " + client.getOldFilesWebdavUri() +
+            Log_OC.e(TAG, "Existence check for " + client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());

From 78613ed4bc6d9351b46e9c086a5f12d09faf672f Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 3 Jul 2018 18:20:25 +0200
Subject: [PATCH 093/133] Cancel chunk upload and implement move files after
 uploading

---
 .../ChunkedUploadRemoteFileOperation.java     | 78 +++++++++----------
 .../files/UploadRemoteFileOperation.java      |  3 +-
 2 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 2da93b78..fb6be04e 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -28,11 +28,11 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
 import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
+import com.owncloud.android.lib.common.operations.OperationCancelledException;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.util.concurrent.TimeUnit;
@@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit;
 import okhttp3.MediaType;
 
 import static com.owncloud.android.lib.common.http.HttpConstants.IF_MATCH_HEADER;
-import static com.owncloud.android.lib.common.http.HttpConstants.OC_TOTAL_LENGTH_HEADER;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -64,46 +63,44 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
     }
 
     @Override
-    protected RemoteOperationResult uploadFile(OwnCloudClient client) throws IOException {
+    protected RemoteOperationResult uploadFile(OwnCloudClient client) throws Exception {
         int status;
         RemoteOperationResult result = null;
-        FileChannel channel = null;
-        RandomAccessFile raf = null;
+        FileChannel channel;
+        RandomAccessFile raf;
 
-        try {
-            File fileToUpload = new File(mLocalPath);
-            MediaType mediaType = MediaType.parse(mMimeType);
+        File fileToUpload = new File(mLocalPath);
+        MediaType mediaType = MediaType.parse(mMimeType);
 
-            raf = new RandomAccessFile(fileToUpload, "r");
-            channel = raf.getChannel();
+        raf = new RandomAccessFile(fileToUpload, "r");
+        channel = raf.getChannel();
 
-            mFileRequestBody = new ChunkFromFileRequestBody(fileToUpload, mediaType, channel, CHUNK_SIZE);
+        mFileRequestBody = new ChunkFromFileRequestBody(fileToUpload, mediaType, channel, CHUNK_SIZE);
 
-            synchronized (mDataTransferListeners) {
-                mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
+        synchronized (mDataTransferListeners) {
+            mFileRequestBody.addDatatransferProgressListeners(mDataTransferListeners);
+        }
+
+        long offset = 0;
+        String uriPrefix = client.getNewUploadsWebDavUri() + FileUtils.PATH_SEPARATOR + String.valueOf(mTransferId);
+        long totalLength = fileToUpload.length();
+        long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
+
+        for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
+            mPutMethod = new PutMethod(
+                    HttpUtils.stringUrlToHttpUrl(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
+            );
+
+            if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
+                mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
             }
 
-            long offset = 0;
-            String uriPrefix = client.getNewUploadsWebDavUri() + FileUtils.PATH_SEPARATOR + String.valueOf(mTransferId);
-            long totalLength = fileToUpload.length();
-            long chunkCount = (long) Math.ceil((double) totalLength / CHUNK_SIZE);
-
-            for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
-                mPutMethod = new PutMethod(
-                        HttpUtils.stringUrlToHttpUrl(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
-                );
-
-                if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
-                    mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
-                }
-
-                ((ChunkFromFileRequestBody) mFileRequestBody).setOffset(offset);
-
-//                if (mCancellationRequested.get()) {
-//                    mPutMethod.abort();
-//                    // next method will throw an exception
-//                }
+            ((ChunkFromFileRequestBody) mFileRequestBody).setOffset(offset);
 
+            if (mCancellationRequested.get()) {
+                result = new RemoteOperationResult(new OperationCancelledException());
+                break;
+            } else {
                 if (chunkIndex == chunkCount - 1) {
                     // Added a high timeout to the last chunk due to when the last chunk
                     // arrives to the server with the last PUT, all chunks get assembled
@@ -126,15 +123,14 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                     break;
                 }
             }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (channel != null)
-                channel.close();
-            if (raf != null)
-                raf.close();
         }
+
+        if (channel != null)
+            channel.close();
+
+        if (raf != null)
+            raf.close();
+
         return result;
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 012bea79..e645342f 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -85,7 +85,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+        RemoteOperationResult result;
 
         try {
             mPutMethod = new PutMethod(
@@ -96,7 +96,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
             if (mCancellationRequested.get()) {
                 // the operation was cancelled before getting it's turn to be executed in the queue of uploads
                 result = new RemoteOperationResult(new OperationCancelledException());
-
             } else {
                 // perform the upload
                 result = uploadFile(client);

From f1c6726d301a43a52f603c9de8012aec5013ba9a Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 4 Jul 2018 10:55:59 +0200
Subject: [PATCH 094/133] Delete remote chunks folder when canceling upload

---
 .../files/CreateRemoteFolderOperation.java    |  6 +--
 .../files/MoveRemoteChunksFileOperation.java  | 19 -------
 .../files/MoveRemoteFileOperation.java        |  8 ++-
 .../files/RemoveRemoteFileOperation.java      |  8 ++-
 .../ChunkedUploadRemoteFileOperation.java     |  4 +-
 .../CreateRemoteChunkFolderOperation.java     |  6 ++-
 .../chunks/MoveRemoteChunksFileOperation.java | 50 +++++++++++++++++++
 .../RemoveRemoteChunksFolderOperation.java    | 16 ++++++
 8 files changed, 86 insertions(+), 31 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
 rename src/com/owncloud/android/lib/resources/files/{ => chunks}/ChunkedUploadRemoteFileOperation.java (96%)
 rename src/com/owncloud/android/lib/resources/files/{ => chunks}/CreateRemoteChunkFolderOperation.java (91%)
 create mode 100644 src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java
 create mode 100644 src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java

diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index ae4a0034..b8727aab 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -57,7 +57,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
 
     private String mRemotePath;
     private boolean mCreateFullPath;
-    protected boolean mFolderToSaveChunks;
+    protected boolean createChunksFolder;
 
     /**
      * Constructor
@@ -67,7 +67,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
     public CreateRemoteFolderOperation(String remotePath, boolean createFullPath) {
         mRemotePath = remotePath;
         mCreateFullPath = createFullPath;
-        mFolderToSaveChunks = false;
+        createChunksFolder = false;
     }
 
     /**
@@ -103,7 +103,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
     private RemoteOperationResult createFolder(OwnCloudClient client) {
         RemoteOperationResult result;
         try {
-            Uri webDavUri = mFolderToSaveChunks ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
+            Uri webDavUri = createChunksFolder ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
             final MkColMethod mkcol = new MkColMethod(HttpUrl.parse(webDavUri + WebdavUtils.encodePath(mRemotePath)));
             mkcol.setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS);
             mkcol.setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS);
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
deleted file mode 100644
index 7c8859de..00000000
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteChunksFileOperation.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.owncloud.android.lib.resources.files;
-
-public class MoveRemoteChunksFileOperation extends MoveRemoteFileOperation {
-
-    /**
-     * Constructor.
-     *
-     * @param srcRemotePath    Remote path of the file/folder to move.
-     * @param targetRemotePath Remove path desired for the file/folder after moving it.
-     * @param overwrite
-     */
-    public MoveRemoteChunksFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite,
-                                         String fileLastModifTimestamp, long fileLength) {
-        super(srcRemotePath, targetRemotePath, overwrite);
-        isChunkedFile = true;
-        mFileLastModifTimestamp = fileLastModifTimestamp;
-        mFileLength = fileLength;
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 2ec989ca..7b291b66 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -60,7 +60,7 @@ public class MoveRemoteFileOperation extends RemoteOperation {
     private String mTargetRemotePath;
     private boolean mOverwrite;
 
-    protected boolean isChunkedFile;
+    protected boolean moveChunkedFile = false;
     protected String mFileLastModifTimestamp;
     protected long mFileLength;
 
@@ -79,7 +79,6 @@ public class MoveRemoteFileOperation extends RemoteOperation {
         mSrcRemotePath = srcRemotePath;
         mTargetRemotePath = targetRemotePath;
         mOverwrite = overwrite;
-        isChunkedFile = false;
     }
 
     /**
@@ -111,17 +110,16 @@ public class MoveRemoteFileOperation extends RemoteOperation {
         /// perform remote operation
         RemoteOperationResult result;
         try {
-
             // After finishing a chunked upload, we have to move the resulting file from uploads folder to files one,
             // so this uri has to be customizable
-            Uri srcWebDavUri = isChunkedFile ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
+            Uri srcWebDavUri = moveChunkedFile ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
 
             final MoveMethod move = new MoveMethod(
                     HttpUrl.parse(srcWebDavUri + WebdavUtils.encodePath(mSrcRemotePath)),
                 client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
-            if (isChunkedFile) {
+            if (moveChunkedFile) {
                 move.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
                 move.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(mFileLength));
             }
diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 24a47688..7fed429c 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -24,6 +24,8 @@
 
 package com.owncloud.android.lib.resources.files;
 
+import android.net.Uri;
+
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.HttpUtils;
@@ -46,6 +48,8 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
     private static final String TAG = RemoveRemoteFileOperation.class.getSimpleName();
     private String mRemotePath;
 
+    protected boolean removeChunksFolder = false;
+
     /**
      * Constructor
      *
@@ -65,8 +69,10 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult result;
 
         try {
+            Uri srcWebDavUri = removeChunksFolder ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
+
             DeleteMethod deleteMethod = new DeleteMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath))
+                    HttpUtils.stringUrlToHttpUrl(srcWebDavUri + WebdavUtils.encodePath(mRemotePath))
             );
 
             int status = client.executeHttpMethod(deleteMethod);
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
similarity index 96%
rename from src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
rename to src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index fb6be04e..905944ad 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.resources.files;
+package com.owncloud.android.lib.resources.files.chunks;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpUtils;
@@ -31,6 +31,8 @@ import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
 
 import java.io.File;
 import java.io.RandomAccessFile;
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java
similarity index 91%
rename from src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java
rename to src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java
index 8c5ecc17..2fc9d4bf 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteChunkFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java
@@ -22,7 +22,9 @@
  *
  */
 
-package com.owncloud.android.lib.resources.files;
+package com.owncloud.android.lib.resources.files.chunks;
+
+import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation;
 
 /**
  * Remote operation performing the creation of a new folder to save chunks during an upload to the ownCloud server.
@@ -38,6 +40,6 @@ public class CreateRemoteChunkFolderOperation extends CreateRemoteFolderOperatio
      */
     public CreateRemoteChunkFolderOperation(String remotePath, boolean createFullPath) {
         super(remotePath, createFullPath);
-        mFolderToSaveChunks = true;
+        createChunksFolder = true;
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java
new file mode 100644
index 00000000..5c84609a
--- /dev/null
+++ b/src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java
@@ -0,0 +1,50 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.files.chunks;
+
+import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation;
+
+/**
+ * Remote operation to move the file built from chunks after uploading it
+ *
+ * @author David González Verdugo
+ */
+public class MoveRemoteChunksFileOperation extends MoveRemoteFileOperation {
+
+    /**
+     * Constructor.
+     *
+     * @param srcRemotePath    Remote path of the file/folder to move.
+     * @param targetRemotePath Remove path desired for the file/folder after moving it.
+     * @param overwrite
+     */
+    public MoveRemoteChunksFileOperation(String srcRemotePath, String targetRemotePath, boolean overwrite,
+                                         String fileLastModifTimestamp, long fileLength) {
+        super(srcRemotePath, targetRemotePath, overwrite);
+        moveChunkedFile = true;
+        mFileLastModifTimestamp = fileLastModifTimestamp;
+        mFileLength = fileLength;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
new file mode 100644
index 00000000..831cc79c
--- /dev/null
+++ b/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
@@ -0,0 +1,16 @@
+package com.owncloud.android.lib.resources.files.chunks;
+
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+
+public class RemoveRemoteChunksFolderOperation extends RemoveRemoteFileOperation {
+
+    /**
+     * Constructor
+     *
+     * @param remotePath RemotePath of the remote file or folder to remove from the server
+     */
+    public RemoveRemoteChunksFolderOperation(String remotePath) {
+        super(remotePath);
+        removeChunksFolder = true;
+    }
+}
\ No newline at end of file

From bd5dc20842a51ae0cc7b772579d16301ed2d64ed Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 4 Jul 2018 17:24:30 +0200
Subject: [PATCH 095/133] make automatic login with session timeout on saml
 work

---
 dav4android                                   |  2 +-
 .../android/lib/common/OwnCloudClient.java    | 24 +++++++++++++++----
 .../common/http/methods/webdav/DavMethod.java |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/dav4android b/dav4android
index b20c44c6..1108048f 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit b20c44c63f45355599d4bfaf00042964b9e6cafa
+Subproject commit 1108048f1a2ff12103cdf6a95307a314d621c088
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 12bf18a9..28a90c68 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -46,6 +46,7 @@ import java.io.InputStream;
 import java.util.List;
 
 import at.bitfire.dav4android.exception.HttpException;
+import at.bitfire.dav4android.exception.RedirectException;
 import okhttp3.Cookie;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
@@ -131,16 +132,21 @@ public class OwnCloudClient extends HttpClient {
 
         boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
-        int status;
+        int status = -1;
 
         do {
             try {
                 status = method.execute();
-            } catch (HttpException e) {
-                if(e.getMessage().contains(Integer.toString(HttpConstants.HTTP_MOVED_TEMPORARILY))) {
+                checkFirstRedirection(method);
+                if(mFollowRedirects) {
+                    status = followRedirection(method).getLastStatus();
+                }
+            } catch (RedirectException e) {
+                // redirect must be handled twice. Once for dav4droid and once okhttp redirect errors
+                status = e.getStatus();
+                mRedirectedLocation = e.getRedirectLocation();
+                if(mFollowRedirects) {
                     status = followRedirection(method).getLastStatus();
-                } else {
-                    throw e;
                 }
             }
 
@@ -153,6 +159,14 @@ public class OwnCloudClient extends HttpClient {
         return status;
     }
 
+    private void checkFirstRedirection(HttpBaseMethod method) {
+
+        final String location = method.getResponseHeader("location");
+        if(location != null && !location.isEmpty()) {
+            mRedirectedLocation = location;
+        }
+    }
+
     private int executeRedirectedHttpMethod (HttpBaseMethod method) throws Exception {
         boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index 7c5c0332..59802714 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -47,6 +47,7 @@ public abstract class DavMethod extends HttpBaseMethod {
                 mOkHttpClient,
                 httpUrl
         );
+        mDavResource.setFollowRedirects(false);
     }
 
     public DavResource getDavResource() {

From c33c7c551ddc960ada73fb1ff5cc752613f136d1 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 5 Jul 2018 15:25:51 +0200
Subject: [PATCH 096/133] make redirection actually work ... finaly

---
 dav4android                                   |  2 +-
 .../lib/sampleclient/MainActivity.java        |  8 ++--
 .../android/lib/common/OwnCloudClient.java    | 22 +++--------
 .../OwnCloudSamlSsoCredentials.java           |  1 +
 .../oauth/OAuth2GetAccessTokenOperation.java  |  2 +-
 .../common/http/methods/HttpBaseMethod.java   | 12 +++++-
 .../http/methods/nonwebdav/DeleteMethod.java  |  4 +-
 .../http/methods/nonwebdav/GetMethod.java     |  4 +-
 .../http/methods/nonwebdav/HttpMethod.java    |  2 +-
 .../http/methods/nonwebdav/PostMethod.java    |  5 +--
 .../http/methods/nonwebdav/PutMethod.java     |  5 +--
 .../http/methods/webdav/CopyMethod.java       |  2 +-
 .../common/http/methods/webdav/DavMethod.java | 35 ++++++++++++++---
 .../http/methods/webdav/MkColMethod.java      |  2 +-
 .../http/methods/webdav/MoveMethod.java       |  2 +-
 .../http/methods/webdav/PropfindMethod.java   |  2 +-
 .../common/http/methods/webdav/PutMethod.java |  2 +-
 .../common/operations/RemoteOperation.java    | 20 +++++-----
 .../files/ExistenceCheckRemoteOperation.java  | 13 +------
 .../lib/resources/files/RemoteFile.java       |  4 +-
 .../status/GetRemoteStatusOperation.java      | 39 +++++++++----------
 21 files changed, 102 insertions(+), 86 deletions(-)

diff --git a/dav4android b/dav4android
index 1108048f..c6c06a14 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 1108048f1a2ff12103cdf6a95307a314d621c088
+Subproject commit c6c06a144a1eaf3a75035dfe8700c42b86b0d223
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index c8f1dfa9..72e61460 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -174,7 +174,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			});
 		}).start();
 //    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
-//    	refreshOperation.execute(mClient, this, mHandler);
+//    	refreshOperation.onExecute(mClient, this, mHandler);
     }
     
     private void startUpload() {
@@ -210,7 +210,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 //    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
 //    	uploadOperation.addDatatransferProgressListener(this);
-//    	uploadOperation.execute(mClient, this, mHandler);
+//    	uploadOperation.onExecute(mClient, this, mHandler);
     }
 
     private void startRemoteDeletion() {
@@ -237,7 +237,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 
 //    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
-//    	removeOperation.execute(mClient, this, mHandler);
+//    	removeOperation.onExecute(mClient, this, mHandler);
     }
 
     private void startDownload() {
@@ -268,7 +268,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 //    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
 //    	downloadOperation.addDatatransferProgressListener(this);
-//    	downloadOperation.execute(mClient, this, mHandler);
+//    	downloadOperation.onExecute(mClient, this, mHandler);
     }
     
     @SuppressWarnings("deprecation")
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 28a90c68..79d45023 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -132,22 +132,13 @@ public class OwnCloudClient extends HttpClient {
 
         boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
-        int status = -1;
+        int status;
 
         do {
-            try {
-                status = method.execute();
-                checkFirstRedirection(method);
-                if(mFollowRedirects) {
-                    status = followRedirection(method).getLastStatus();
-                }
-            } catch (RedirectException e) {
-                // redirect must be handled twice. Once for dav4droid and once okhttp redirect errors
-                status = e.getStatus();
-                mRedirectedLocation = e.getRedirectLocation();
-                if(mFollowRedirects) {
-                    status = followRedirection(method).getLastStatus();
-                }
+            status = method.execute();
+            checkFirstRedirection(method);
+            if(mFollowRedirects && !isIdPRedirection()) {
+                status = followRedirection(method).getLastStatus();
             }
 
             repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
@@ -160,7 +151,6 @@ public class OwnCloudClient extends HttpClient {
     }
 
     private void checkFirstRedirection(HttpBaseMethod method) {
-
         final String location = method.getResponseHeader("location");
         if(location != null && !location.isEmpty()) {
             mRedirectedLocation = location;
@@ -414,7 +404,7 @@ public class OwnCloudClient extends HttpClient {
                     mOwnCloudClientManager.removeClientFor(mAccount);
                 }
             }
-            // else: execute will finish with status 401
+            // else: onExecute will finish with status 401
         }
 
         return credentialsWereRefreshed;
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 30d5d504..3cba25d7 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -45,6 +45,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
         HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
         HttpClient.addHeaderForAllRequests(HttpConstants.COOKIE_HEADER, mSessionCookie);
+        client.setFollowRedirects(false);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
index d84d9f44..6d06cdc2 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
@@ -107,7 +107,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
             postMethod.setRequestBody(requestBody);
 
 
-            // Do the B***S*** Switch and execute
+            // Do the B***S*** Switch and onExecute
             OwnCloudCredentials oauthCredentials =
                     new OwnCloudBasicCredentials(mClientId, mClientSecret);
             OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index f03ae1c1..c1ffd5c2 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -46,7 +46,6 @@ import okhttp3.Response;
  * @author David González Verdugo
  */
 public abstract class HttpBaseMethod {
-    public abstract int execute() throws Exception;
     protected OkHttpClient mOkHttpClient;
     protected Request mRequest;
     protected RequestBody mRequestBody;
@@ -60,6 +59,10 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
+    public int execute() throws Exception {
+        return onExecute();
+    }
+
     public void abort() {
         mCall.cancel();
     }
@@ -68,6 +71,13 @@ public abstract class HttpBaseMethod {
         return mCall.isCanceled();
     }
 
+
+    //////////////////////////////
+    //         For override
+    //////////////////////////////
+
+    protected abstract int onExecute() throws Exception;
+
     //////////////////////////////
     //         Getter
     //////////////////////////////
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
index 9ed7307a..249dc520 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
@@ -39,11 +39,11 @@ public class DeleteMethod extends HttpMethod{
     }
 
     @Override
-    public int execute() throws IOException {
+    public int onExecute() throws IOException {
         mRequest = mRequest.newBuilder()
                 .delete()
                 .build();
 
-        return super.execute();
+        return super.onExecute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index b24b9bce..9e33df29 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -39,11 +39,11 @@ public class GetMethod extends HttpMethod {
     }
 
     @Override
-    public int execute() throws IOException {
+    public int onExecute() throws IOException {
         mRequest = mRequest.newBuilder()
                 .get()
                 .build();
 
-        return super.execute();
+        return super.onExecute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index a439b03b..0321bf15 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -43,7 +43,7 @@ public abstract class HttpMethod extends HttpBaseMethod {
     }
 
     @Override
-    public int execute() throws IOException {
+    public int onExecute() throws IOException {
         mCall = mOkHttpClient.newCall(mRequest);
         mResponse = mCall.execute();
         return super.getStatusCode();
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
index 680400b6..5d0a3c7f 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
@@ -27,7 +27,6 @@ package com.owncloud.android.lib.common.http.methods.nonwebdav;
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
-import okhttp3.RequestBody;
 
 /**
  * OkHttp post calls wrapper
@@ -40,11 +39,11 @@ public class PostMethod extends HttpMethod {
     }
 
     @Override
-    public int execute() throws IOException {
+    public int onExecute() throws IOException {
         mRequest = mRequest.newBuilder()
                 .post(mRequestBody)
                 .build();
 
-        return super.execute();
+        return super.onExecute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
index 64bf0f25..ede0db28 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
@@ -27,7 +27,6 @@ package com.owncloud.android.lib.common.http.methods.nonwebdav;
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
-import okhttp3.RequestBody;
 
 public class PutMethod extends HttpMethod{
 
@@ -36,11 +35,11 @@ public class PutMethod extends HttpMethod{
     }
 
     @Override
-    public int execute() throws IOException {
+    public int onExecute() throws IOException {
         mRequest = mRequest.newBuilder()
                 .put(mRequestBody)
                 .build();
 
-        return super.execute();
+        return super.onExecute();
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
index 9bcb9ce0..e133c536 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
@@ -15,7 +15,7 @@ public class CopyMethod extends DavMethod {
     }
 
     @Override
-    public int execute() throws Exception {
+    public int onExecute() throws Exception {
         try {
             mDavResource.copy(destinationUrl, forceOverride);
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index 59802714..caed4780 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -31,6 +31,7 @@ import java.util.concurrent.TimeUnit;
 
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.exception.RedirectException;
 import okhttp3.HttpUrl;
 
 /**
@@ -50,9 +51,6 @@ public abstract class DavMethod extends HttpBaseMethod {
         mDavResource.setFollowRedirects(false);
     }
 
-    public DavResource getDavResource() {
-        return mDavResource;
-    }
 
     @Override
     public void abort() {
@@ -60,10 +58,19 @@ public abstract class DavMethod extends HttpBaseMethod {
     }
 
     @Override
-    public boolean isAborted() {
-        return mDavResource.isCallAborted();
+    public int execute() throws Exception {
+        try {
+             return onExecute();
+        } catch(RedirectException e) {
+            mResponse = getDavResource().getResponse();
+            return getStatusCode();
+        }
     }
 
+    //////////////////////////////
+    //         setter
+    //////////////////////////////
+
     // Connection parameters
     @Override
     public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
@@ -85,8 +92,26 @@ public abstract class DavMethod extends HttpBaseMethod {
         mDavResource.setRetryOnConnectionFailure(retryOnConnectionFailure);
     }
 
+    //////////////////////////////
+    //         getter
+    //////////////////////////////
+
     @Override
     public boolean getRetryOnConnectionFailure() {
         return mDavResource.isRetryOnConnectionFailure();
     }
+
+    @Override
+    public boolean isAborted() {
+        return mDavResource.isCallAborted();
+    }
+
+
+    public DavResource getDavResource() {
+        return mDavResource;
+    }
+
+    public void setUrl(HttpUrl url) {
+        mDavResource = new DavOCResource(mOkHttpClient, url);
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
index ac8ebd06..91a13d5b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
@@ -9,7 +9,7 @@ public class MkColMethod extends DavMethod {
     }
 
     @Override
-    public int execute() throws Exception {
+    public int onExecute() throws Exception {
         try {
             mDavResource.mkCol(null);
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
index 48861c6b..b5f1e65a 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
@@ -16,7 +16,7 @@ public class MoveMethod extends DavMethod {
     }
 
     @Override
-    public int execute() throws Exception {
+    public int onExecute() throws Exception {
         try {
             mDavResource.move(
                     destinationUrl,
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index 0f4f5ad4..f509c002 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -51,7 +51,7 @@ public class PropfindMethod extends DavMethod {
     };
 
     @Override
-    public int execute() throws IOException, HttpException, DavException {
+    public int onExecute() throws IOException, HttpException, DavException {
         try {
             mDavResource.propfind(mDepth, mProperties);
             mMembers = mDavResource.getMembers();
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index 020bdcad..24e4c660 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -45,7 +45,7 @@ public class PutMethod extends DavMethod {
     };
 
     @Override
-    public int execute() throws IOException, HttpException {
+    public int onExecute() throws IOException, HttpException {
         try {
             mDavResource.put(
                     mRequestBody,
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 32be1215..365fcdcf 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -45,7 +45,7 @@ import okhttp3.OkHttpClient;
 /**
  * Operation which execution involves one or several interactions with an ownCloud server.
  *
- * Provides methods to execute the operation both synchronously or asynchronously.
+ * Provides methods to onExecute the operation both synchronously or asynchronously.
  *
  * @author David A. Velasco
  * @author David González Verdugo
@@ -115,10 +115,10 @@ public abstract class RemoteOperation implements Runnable {
      */
     public RemoteOperationResult execute(Account account, Context context) {
         if (account == null)
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
                     "Account");
         if (context == null)
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
                     "Context");
         mAccount = account;
         mContext = context.getApplicationContext();
@@ -138,7 +138,7 @@ public abstract class RemoteOperation implements Runnable {
      */
     public RemoteOperationResult execute(OwnCloudClient client) {
         if (client == null)
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
                     "OwnCloudClient");
         mClient = client;
         if (client.getAccount() != null) {
@@ -160,7 +160,7 @@ public abstract class RemoteOperation implements Runnable {
      */
     public RemoteOperationResult execute(OkHttpClient client, Context context) {
         if (client == null)
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
                     "OwnCloudClient");
         mHttpClient = client;
         mContext = context;
@@ -188,10 +188,10 @@ public abstract class RemoteOperation implements Runnable {
 
         if (account == null)
             throw new IllegalArgumentException
-                    ("Trying to execute a remote operation with a NULL Account");
+                    ("Trying to onExecute a remote operation with a NULL Account");
         if (context == null)
             throw new IllegalArgumentException
-                    ("Trying to execute a remote operation with a NULL Context");
+                    ("Trying to onExecute a remote operation with a NULL Context");
         // mAccount and mContext in the runnerThread to create below
         mAccount = account;
         mContext = context.getApplicationContext();
@@ -221,7 +221,7 @@ public abstract class RemoteOperation implements Runnable {
                           OnRemoteOperationListener listener, Handler listenerHandler) {
         if (client == null) {
             throw new IllegalArgumentException
-                    ("Trying to execute a remote operation with a NULL OwnCloudClient");
+                    ("Trying to onExecute a remote operation with a NULL OwnCloudClient");
         }
         mClient = client;
         if (client.getAccount() != null) {
@@ -231,7 +231,7 @@ public abstract class RemoteOperation implements Runnable {
 
         if (listener == null) {
             throw new IllegalArgumentException
-                    ("Trying to execute a remote operation asynchronously " +
+                    ("Trying to onExecute a remote operation asynchronously " +
                             "without a listener to notiy the result");
         }
         mListener = listener;
@@ -275,7 +275,7 @@ public abstract class RemoteOperation implements Runnable {
     }
 
     /**
-     * Run operation for asynchronous or synchronous 'execute' method.
+     * Run operation for asynchronous or synchronous 'onExecute' method.
      *
      * Considers and performs silent refresh of account credentials if possible, and if
      * {@link RemoteOperation#setSilentRefreshOfAccountCredentials(boolean)} was called with
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 456a7425..bf9090cd 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -86,7 +86,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
         try {
 
-//            client.setFollowRedirects(false);
+            client.setFollowRedirects(true);
             PropfindMethod propfindMethod = new PropfindMethod(
                     HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0,
@@ -97,14 +97,6 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
             int status = client.executeHttpMethod(propfindMethod);
 
-//            if (previousFollowRedirects) {
-//                mRedirectionPath = client.followRedirection(propfind);
-//                status = mRedirectionPath.getLastStatus();
-//            }
-//            if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
-//                client.exhaustResponse(propfind.getResponseBodyAsStream());
-//            }
-
             /**
              *  PROPFIND method
              *  404 NOT FOUND: path doesn't exist,
@@ -127,9 +119,8 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());
 
-        } finally {
-//            client.setFollowRedirects(previousFollowRedirects);
         }
+
         return result;
     }
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index c675f803..14ed0e2d 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -210,7 +210,9 @@ public class RemoteFile implements Parcelable, Serializable {
                 ? BigDecimal.valueOf(
                         properties.get(QuotaAvailableBytes.class).getQuotaAvailableBytes())
                 : BigDecimal.ZERO);
-        this.setPrivateLink(properties.get(OCPrivatelink.class).getLink());
+        this.setPrivateLink(properties.get(OCPrivatelink.class) != null
+                ? properties.get(OCPrivatelink.class).getLink()
+                : null);
     }
 
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 719a25d1..55e2c55a 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -47,6 +47,8 @@ import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 
+import okhttp3.HttpUrl;
+
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
 
@@ -100,28 +102,25 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                 return false;
             }
 
-
+            client.setFollowRedirects(false);
             boolean isRedirectToNonSecureConnection = false;
+            String redirectedLocation = mLatestResult.getRedirectedLocation();
+            while (redirectedLocation != null && redirectedLocation.length() > 0
+                && !mLatestResult.isSuccess()) {
 
-            // TODO Check this, although OkHttp should take care of the redirections
-//            boolean isRedirectToNonSecureConnection = false;
-//            String redirectedLocation = mLatestResult.getRedirectedLocation();
-//            while (redirectedLocation != null && redirectedLocation.length() > 0
-//                && !mLatestResult.isSuccess()) {
-//
-//                isRedirectToNonSecureConnection |= (
-//                    baseUrlSt.startsWith(HTTPS_PREFIX) &&
-//                        redirectedLocation.startsWith(HTTP_PREFIX)
-//                );
-//                get.releaseConnection();
-//                get = new GetMethod(redirectedLocation);
-//                status = client.executeRequest(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
-//                mLatestResult = new RemoteOperationResult(
-//                    (status == HttpConstants.HTTP_OK),
-//                    get
-//                );
-//                redirectedLocation = mLatestResult.getRedirectedLocation();
-//            }
+                isRedirectToNonSecureConnection |= (
+                    baseUrlSt.startsWith(HTTPS_PREFIX) &&
+                        redirectedLocation.startsWith(HTTP_PREFIX)
+                );
+
+                getMethod = new GetMethod(HttpUrl.parse(redirectedLocation));
+                getMethod.setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+                getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
+
+                status = client.executeHttpMethod(getMethod);
+                mLatestResult = new RemoteOperationResult(getMethod);
+                redirectedLocation = mLatestResult.getRedirectedLocation();
+            }
 
             if (isSuccess(status)) {
 

From 06ec99aead102308cf2ec52adfeca5c2f847d4b2 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 6 Jul 2018 10:56:26 +0200
Subject: [PATCH 097/133] replace httpUrl with URL outside the wrapper

---
 .../lib/common/SingleSessionManager.java      |  7 ++--
 .../oauth/OAuth2GetAccessTokenOperation.java  |  3 +-
 .../OAuth2RefreshAccessTokenOperation.java    |  3 +-
 .../android/lib/common/http/HttpUtils.java    | 37 -------------------
 .../common/http/methods/HttpBaseMethod.java   |  5 ++-
 .../http/methods/nonwebdav/DeleteMethod.java  |  5 ++-
 .../http/methods/nonwebdav/GetMethod.java     |  5 ++-
 .../http/methods/nonwebdav/HttpMethod.java    |  5 ++-
 .../http/methods/nonwebdav/PostMethod.java    |  5 ++-
 .../http/methods/nonwebdav/PutMethod.java     |  5 ++-
 .../http/methods/webdav/CopyMethod.java       |  6 ++-
 .../common/http/methods/webdav/DavMethod.java |  8 ++--
 .../http/methods/webdav/MkColMethod.java      |  7 ++--
 .../http/methods/webdav/MoveMethod.java       |  7 ++--
 .../http/methods/webdav/PropfindMethod.java   |  5 ++-
 .../common/http/methods/webdav/PutMethod.java |  5 ++-
 .../lib/common/network/NetworkUtils.java      |  6 ---
 .../android/lib/common/utils/Log_OC.java      |  5 ---
 .../files/CopyRemoteFileOperation.java        |  4 +-
 .../files/CreateRemoteFolderOperation.java    |  3 +-
 .../files/DownloadRemoteFileOperation.java    |  3 +-
 .../files/ExistenceCheckRemoteOperation.java  | 25 +++++--------
 .../files/MoveRemoteFileOperation.java        |  3 +-
 .../files/ReadRemoteFileOperation.java        |  4 +-
 .../files/ReadRemoteFolderOperation.java      |  4 +-
 .../files/RemoveRemoteFileOperation.java      |  6 +--
 .../files/RenameRemoteFileOperation.java      |  3 +-
 .../files/UploadRemoteFileOperation.java      |  4 +-
 .../ChunkedUploadRemoteFileOperation.java     |  4 +-
 .../shares/CreateRemoteShareOperation.java    |  6 +--
 .../shares/GetRemoteShareOperation.java       |  7 ++--
 .../shares/GetRemoteShareesOperation.java     | 20 +++++-----
 .../GetRemoteSharesForFileOperation.java      | 15 ++++----
 .../shares/GetRemoteSharesOperation.java      |  5 +--
 .../shares/RemoveRemoteShareOperation.java    |  6 +--
 .../shares/UpdateRemoteShareOperation.java    |  8 +---
 .../GetRemoteCapabilitiesOperation.java       |  6 +--
 .../status/GetRemoteStatusOperation.java      | 14 ++-----
 .../users/GetRemoteUserAvatarOperation.java   |  9 ++---
 .../users/GetRemoteUserInfoOperation.java     |  6 +--
 .../users/GetRemoteUserQuotaOperation.java    |  4 +-
 41 files changed, 117 insertions(+), 181 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/common/http/HttpUtils.java

diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 911ac59d..e36f5fe2 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -57,10 +57,10 @@ public class SingleSessionManager implements OwnCloudClientManager {
     private static final String TAG = SingleSessionManager.class.getSimpleName();
 
     private ConcurrentMap<String, OwnCloudClient> mClientsWithKnownUsername =
-        new ConcurrentHashMap<String, OwnCloudClient>();
+        new ConcurrentHashMap<>();
 
     private ConcurrentMap<String, OwnCloudClient> mClientsWithUnknownUsername =
-        new ConcurrentHashMap<String, OwnCloudClient>();
+        new ConcurrentHashMap<>();
 
 
     @Override
@@ -80,8 +80,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
         String sessionName = account.getCredentials() == null ? "" :
             AccountUtils.buildAccountName(
                 account.getBaseUri(),
-                account.getCredentials().getAuthToken()
-            );
+                account.getCredentials().getAuthToken());
 
         if (accountName != null) {
             client = mClientsWithKnownUsername.get(accountName);
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
index 6d06cdc2..6d0e9b8c 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
@@ -38,6 +38,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
 
 import org.json.JSONObject;
 
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -98,7 +99,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
             Uri.Builder uriBuilder = client.getBaseUri().buildUpon();
             uriBuilder.appendEncodedPath(mAccessTokenEndpointPath);
 
-            final PostMethod postMethod = new PostMethod(HttpUrl.parse(
+            final PostMethod postMethod = new PostMethod(new URL(
                     client.getBaseUri().buildUpon()
                             .appendEncodedPath(mAccessTokenEndpointPath)
                             .build()
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
index d8cb3a50..7f182b49 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
@@ -33,6 +33,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.json.JSONObject;
 
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -90,7 +91,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
             Uri.Builder uriBuilder = client.getBaseUri().buildUpon();
             uriBuilder.appendEncodedPath(mAccessTokenEndpointPath);
 
-            final PostMethod postMethod = new PostMethod(HttpUrl.parse(
+            final PostMethod postMethod = new PostMethod(new URL(
                     client.getBaseUri().buildUpon()
                             .appendEncodedPath(mAccessTokenEndpointPath)
                             .build()
diff --git a/src/com/owncloud/android/lib/common/http/HttpUtils.java b/src/com/owncloud/android/lib/common/http/HttpUtils.java
deleted file mode 100644
index 588d5aa3..00000000
--- a/src/com/owncloud/android/lib/common/http/HttpUtils.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.http;
-
-import okhttp3.HttpUrl;
-
-/**
- * @author David González Verdugo
- */
-public class HttpUtils {
-
-    public static HttpUrl stringUrlToHttpUrl(String url) {
-        return HttpUrl.parse(url);
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index c1ffd5c2..7ea9b3e1 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -28,6 +28,7 @@ import com.owncloud.android.lib.common.http.HttpClient;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
@@ -52,10 +53,10 @@ public abstract class HttpBaseMethod {
     protected Response mResponse;
     protected Call mCall;
 
-    protected HttpBaseMethod (HttpUrl httpUrl) {
+    protected HttpBaseMethod (URL url) {
         mOkHttpClient = HttpClient.getOkHttpClient();
         mRequest = new Request.Builder()
-                .url(httpUrl)
+                .url(HttpUrl.parse(url.toString()))
                 .build();
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
index 249dc520..5b9c6d1b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import java.io.IOException;
+import java.net.URL;
 
 import okhttp3.HttpUrl;
 
@@ -34,8 +35,8 @@ import okhttp3.HttpUrl;
  */
 public class DeleteMethod extends HttpMethod{
 
-    public DeleteMethod(HttpUrl httpUrl) {
-        super(httpUrl);
+    public DeleteMethod(URL url) {
+        super(url);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
index 9e33df29..183a7299 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import java.io.IOException;
+import java.net.URL;
 
 import okhttp3.HttpUrl;
 
@@ -34,8 +35,8 @@ import okhttp3.HttpUrl;
  */
 public class GetMethod extends HttpMethod {
 
-    public GetMethod(HttpUrl httpUrl) {
-        super(httpUrl);
+    public GetMethod(URL url) {
+        super(url);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
index 0321bf15..3c73bf3f 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.common.http.methods.nonwebdav;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import java.io.IOException;
+import java.net.URL;
 
 import okhttp3.Call;
 import okhttp3.HttpUrl;
@@ -38,8 +39,8 @@ import okhttp3.HttpUrl;
  */
 public abstract class HttpMethod extends HttpBaseMethod {
 
-    public HttpMethod(HttpUrl httpUrl) {
-        super(httpUrl);
+    public HttpMethod(URL url) {
+        super(url);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
index 5d0a3c7f..970252e1 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import java.io.IOException;
+import java.net.URL;
 
 import okhttp3.HttpUrl;
 
@@ -34,8 +35,8 @@ import okhttp3.HttpUrl;
  */
 public class PostMethod extends HttpMethod {
 
-    public PostMethod(HttpUrl httpUrl){
-        super(httpUrl);
+    public PostMethod(URL url){
+        super(url);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
index ede0db28..6497b002 100644
--- a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
@@ -25,13 +25,14 @@
 package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import java.io.IOException;
+import java.net.URL;
 
 import okhttp3.HttpUrl;
 
 public class PutMethod extends HttpMethod{
 
-    public PutMethod(HttpUrl httpUrl){
-        super(httpUrl);
+    public PutMethod(URL url){
+        super(url);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
index e133c536..c1978c52 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
@@ -1,5 +1,7 @@
 package com.owncloud.android.lib.common.http.methods.webdav;
 
+import java.net.URL;
+
 import at.bitfire.dav4android.exception.UnauthorizedException;
 import okhttp3.HttpUrl;
 
@@ -8,8 +10,8 @@ public class CopyMethod extends DavMethod {
     final String destinationUrl;
     final boolean forceOverride;
 
-    public CopyMethod(HttpUrl httpUrl, String destinationUrl, boolean forceOverride) {
-        super(httpUrl);
+    public CopyMethod(URL url, String destinationUrl, boolean forceOverride) {
+        super(url);
         this.destinationUrl = destinationUrl;
         this.forceOverride = forceOverride;
     }
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index caed4780..f10a7ddb 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import at.bitfire.dav4android.DavOCResource;
@@ -42,12 +43,11 @@ public abstract class DavMethod extends HttpBaseMethod {
 
     protected DavOCResource mDavResource;
 
-    protected DavMethod(HttpUrl httpUrl) {
-        super(httpUrl);
+    protected DavMethod(URL url) {
+        super(url);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                httpUrl
-        );
+                HttpUrl.parse(url.toString()));
         mDavResource.setFollowRedirects(false);
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
index 91a13d5b..ace87d67 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
@@ -1,11 +1,12 @@
 package com.owncloud.android.lib.common.http.methods.webdav;
 
+import java.net.URL;
+
 import at.bitfire.dav4android.exception.UnauthorizedException;
-import okhttp3.HttpUrl;
 
 public class MkColMethod extends DavMethod {
-    public MkColMethod(HttpUrl httpUrl) {
-        super(httpUrl);
+    public MkColMethod(URL url) {
+        super(url);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
index b5f1e65a..be4cfa34 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
@@ -2,15 +2,16 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 
 import com.owncloud.android.lib.common.http.HttpConstants;
 
+import java.net.URL;
+
 import at.bitfire.dav4android.exception.UnauthorizedException;
-import okhttp3.HttpUrl;
 
 public class MoveMethod extends DavMethod {
     final String destinationUrl;
     final boolean forceOverride;
 
-    public MoveMethod(HttpUrl httpUrl, String destinationUrl, boolean forceOverride) {
-        super(httpUrl);
+    public MoveMethod(URL url, String destinationUrl, boolean forceOverride) {
+        super(url);
         this.destinationUrl = destinationUrl;
         this.forceOverride = forceOverride;
     }
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index f509c002..29560612 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.http.methods.webdav;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Set;
 
 import at.bitfire.dav4android.DavResource;
@@ -44,8 +45,8 @@ public class PropfindMethod extends DavMethod {
     private Property.Name[] mProperties;
     private Set<DavResource> mMembers;
 
-    public PropfindMethod(HttpUrl httpUrl, int depth, Property.Name[] properties) {
-        super(httpUrl);
+    public PropfindMethod(URL url, int depth, Property.Name[] properties) {
+        super(url);
         mDepth = depth;
         mProperties = properties;
     };
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index 24e4c660..80a48ed1 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 import com.owncloud.android.lib.common.http.HttpConstants;
 
 import java.io.IOException;
+import java.net.URL;
 
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
@@ -40,8 +41,8 @@ import okhttp3.RequestBody;
  */
 public class PutMethod extends DavMethod {
 
-    public PutMethod(HttpUrl httpUrl) {
-        super(httpUrl);
+    public PutMethod(URL url) {
+        super(url);
     };
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/network/NetworkUtils.java b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
index 71740bc1..d9e79706 100644
--- a/src/com/owncloud/android/lib/common/network/NetworkUtils.java
+++ b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
@@ -29,19 +29,13 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
 
-
-
-import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
 import android.content.Context;
diff --git a/src/com/owncloud/android/lib/common/utils/Log_OC.java b/src/com/owncloud/android/lib/common/utils/Log_OC.java
index 9670061f..23e0bd84 100644
--- a/src/com/owncloud/android/lib/common/utils/Log_OC.java
+++ b/src/com/owncloud/android/lib/common/utils/Log_OC.java
@@ -63,11 +63,6 @@ public class Log_OC {
         Log.w(TAG, message);
         appendLog(TAG+" : "+ message);
     }
-    
-    public static void wtf(String TAG, String message) {
-        Log.wtf(TAG, message);
-        appendLog(TAG+" : "+ message);
-    }
 
     /**
      * Start doing logging
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index 2138b226..cc0d9228 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -35,6 +35,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.HttpUrl;
@@ -103,8 +104,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
         /// perform remote operation
         RemoteOperationResult result = null;
         try {
-            CopyMethod copyMethod = new CopyMethod(
-                    HttpUrl.parse(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
+            CopyMethod copyMethod = new CopyMethod(new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mSrcRemotePath)),
                     client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index b8727aab..eb85b53a 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -37,6 +37,7 @@ 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 java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.HttpUrl;
@@ -104,7 +105,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
         RemoteOperationResult result;
         try {
             Uri webDavUri = createChunksFolder ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
-            final MkColMethod mkcol = new MkColMethod(HttpUrl.parse(webDavUri + WebdavUtils.encodePath(mRemotePath)));
+            final MkColMethod mkcol = new MkColMethod(new URL(webDavUri + WebdavUtils.encodePath(mRemotePath)));
             mkcol.setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS);
             mkcol.setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS);
             final int status = client.executeHttpMethod(mkcol);
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 057281cd..0e1493ae 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -37,6 +37,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.net.URL;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -102,7 +103,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult result;
         int status;
         boolean savedFile = false;
-        mGet = new GetMethod(HttpUrl.parse(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
+        mGet = new GetMethod(new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
         Iterator<OnDatatransferProgressListener> it;
 
         FileOutputStream fos = null;
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index bf9090cd..c94b2029 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -26,7 +26,6 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
@@ -35,6 +34,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -54,9 +54,6 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
     private static final String TAG = ExistenceCheckRemoteOperation.class.getSimpleName();
 
-    private static final int FORBIDDEN_ERROR = 403;
-    private static final int SERVICE_UNAVAILABLE_ERROR = 503;
-
     private String mPath;
     private boolean mSuccessIfAbsent;
 
@@ -79,23 +76,19 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
 
-        // TODO Complete redirection stuff, although OkHttp should follow redirections by default
-//        boolean previousFollowRedirects = client.getFollowRedirects();
 
         try {
-
             client.setFollowRedirects(true);
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mPath)),
+                    new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0,
                     DavUtils.getAllPropset());
 
             propfindMethod.setReadTimeout(TIMEOUT, TimeUnit.SECONDS);
             propfindMethod.setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS);
 
-            int status = client.executeHttpMethod(propfindMethod);
+            final int status = client.executeHttpMethod(propfindMethod);
 
             /**
              *  PROPFIND method
@@ -103,25 +96,25 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
              *  207 MULTI_STATUS: path exists.
              */
 
-            result = isSuccess(status)
-                    ? new RemoteOperationResult(OK)
-                    : new RemoteOperationResult(propfindMethod);
-
             Log_OC.d(TAG, "Existence check for " + client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") +
                     "finished with HTTP status " + status + (!isSuccess(status) ? "(FAIL)" : ""));
 
+            return isSuccess(status)
+                    ? new RemoteOperationResult(OK)
+                    : new RemoteOperationResult(propfindMethod);
+
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            final RemoteOperationResult result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Existence check for " + client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());
+            return result;
 
         }
 
-        return result;
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 7b291b66..04628f10 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -36,6 +36,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.HttpUrl;
@@ -115,7 +116,7 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             Uri srcWebDavUri = moveChunkedFile ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
 
             final MoveMethod move = new MoveMethod(
-                    HttpUrl.parse(srcWebDavUri + WebdavUtils.encodePath(mSrcRemotePath)),
+                    new URL(srcWebDavUri + WebdavUtils.encodePath(mSrcRemotePath)),
                 client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mTargetRemotePath),
                     mOverwrite);
 
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 437118b5..432dc1c5 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -32,6 +32,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
@@ -78,8 +79,7 @@ public class ReadRemoteFileOperation extends RemoteOperation {
         /// take the duty of check the server for the current state of the file there
         try {
             // remote request
-            propfind = new PropfindMethod(
-                    HttpUrl.parse(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+            propfind = new PropfindMethod(new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DEPTH_0,
                     DavUtils.getAllPropset());
 
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 4d2a22f7..b54cbd0f 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -26,7 +26,6 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.DavConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
@@ -35,6 +34,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
 import java.util.ArrayList;
 
 import at.bitfire.dav4android.DavResource;
@@ -75,7 +75,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 
         try {
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DavConstants.DEPTH_1,
                     DavUtils.getAllPropset());
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 7fed429c..7be42e00 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -28,13 +28,14 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
+
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
@@ -72,8 +73,7 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
             Uri srcWebDavUri = removeChunksFolder ? client.getNewUploadsWebDavUri() : client.getNewFilesWebDavUri();
 
             DeleteMethod deleteMethod = new DeleteMethod(
-                    HttpUtils.stringUrlToHttpUrl(srcWebDavUri + WebdavUtils.encodePath(mRemotePath))
-            );
+                    new URL(srcWebDavUri + WebdavUtils.encodePath(mRemotePath)));
 
             int status = client.executeHttpMethod(deleteMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index ab1605a1..b9f4de28 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import java.io.File;
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -106,7 +107,7 @@ public class RenameRemoteFileOperation extends RemoteOperation {
                 return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
             }
 
-            final MoveMethod move = new MoveMethod(HttpUrl.parse(client.getNewFilesWebDavUri() +
+            final MoveMethod move = new MoveMethod(new URL(client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mOldRemotePath)),
                     client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mNewRemotePath), false);
 
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index e645342f..1010371f 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -26,7 +26,6 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
 import com.owncloud.android.lib.common.network.FileRequestBody;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
@@ -37,6 +36,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;
+import java.net.URL;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -89,7 +89,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
         try {
             mPutMethod = new PutMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
+                    new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)));
 
             mPutMethod.setRetryOnConnectionFailure(false);
 
diff --git a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index 905944ad..c14a6f88 100644
--- a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -25,7 +25,6 @@
 package com.owncloud.android.lib.resources.files.chunks;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PutMethod;
 import com.owncloud.android.lib.common.network.ChunkFromFileRequestBody;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
@@ -36,6 +35,7 @@ import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
 
 import java.io.File;
 import java.io.RandomAccessFile;
+import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.util.concurrent.TimeUnit;
 
@@ -90,7 +90,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 
         for (int chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++, offset += CHUNK_SIZE) {
             mPutMethod = new PutMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
+                    new URL(uriPrefix + FileUtils.PATH_SEPARATOR + chunkIndex)
             );
 
             if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index b35dc885..8caace0b 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -31,12 +31,12 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -230,9 +230,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            PostMethod postMethod = new PostMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
-            );
+            PostMethod postMethod = new PostMethod(new URL(uriBuilder.build().toString()));
 
             postMethod.setRequestBody(formBodyBuilder.build());
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index ad61f5a9..3945c506 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -30,12 +30,13 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
+
 /**
  * Get the data about a Share resource, known its remote ID.
  *
@@ -64,9 +65,7 @@ public class GetRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            GetMethod getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
-            );
+            GetMethod getMethod = new GetMethod(new URL(uriBuilder.build().toString()));
 
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 97836665..0574ba1a 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -32,7 +32,6 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -41,6 +40,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.net.URL;
 import java.util.ArrayList;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -123,17 +123,15 @@ public class GetRemoteShareesOperation extends RemoteOperation{
 
         try{
             Uri requestUri = client.getBaseUri();
-            Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(OCS_ROUTE);
-            uriBuilder.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT);
-            uriBuilder.appendQueryParameter(PARAM_ITEM_TYPE, VALUE_ITEM_TYPE);
-            uriBuilder.appendQueryParameter(PARAM_SEARCH, mSearchString);
-            uriBuilder.appendQueryParameter(PARAM_PAGE, String.valueOf(mPage));
-            uriBuilder.appendQueryParameter(PARAM_PER_PAGE, String.valueOf(mPerPage));
+            Uri.Builder uriBuilder = requestUri.buildUpon()
+                    .appendEncodedPath(OCS_ROUTE)
+                    .appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT)
+                    .appendQueryParameter(PARAM_ITEM_TYPE, VALUE_ITEM_TYPE)
+                    .appendQueryParameter(PARAM_SEARCH, mSearchString)
+                    .appendQueryParameter(PARAM_PAGE, String.valueOf(mPage))
+                    .appendQueryParameter(PARAM_PER_PAGE, String.valueOf(mPerPage));
 
-            GetMethod getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
-            );
+            GetMethod getMethod = new GetMethod(new URL(uriBuilder.build().toString()));
 
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index 02b36900..18409152 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -36,6 +36,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
+
 import okhttp3.HttpUrl;
 
 /**
@@ -81,19 +83,16 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
         RemoteOperationResult result;
 
         try {
+
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
+            uriBuilder.appendQueryParameter(PARAM_PATH, mRemoteFilePath);
+            uriBuilder.appendQueryParameter(PARAM_RESHARES, String.valueOf(mReshares));
+            uriBuilder.appendQueryParameter(PARAM_SUBFILES, String.valueOf(mSubfiles));
 
-            HttpUrl.Builder httpBuilder = HttpUrl
-                    .parse(uriBuilder.build().toString())
-                    .newBuilder();
+            GetMethod getMethod = new GetMethod(new URL(uriBuilder.build().toString()));
 
-            httpBuilder.addQueryParameter(PARAM_PATH, mRemoteFilePath);
-            httpBuilder.addQueryParameter(PARAM_RESHARES, String.valueOf(mReshares));
-            httpBuilder.addQueryParameter(PARAM_SUBFILES, String.valueOf(mSubfiles));
-
-            GetMethod getMethod = new GetMethod(httpBuilder.build());
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 7a64bb6b..28bd93d5 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -29,13 +29,12 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import okhttp3.Request;
+import java.net.URL;
 
 /**
  * Get the data from the server about ALL the known shares owned by the requester.
@@ -59,7 +58,7 @@ public class GetRemoteSharesOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
             GetMethod getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getBaseUri() + ShareUtils.SHARING_API_PATH)
+                    new URL(client.getBaseUri() + ShareUtils.SHARING_API_PATH)
             );
 
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index aba0937d..fb53f57b 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -31,13 +31,12 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import okhttp3.Request;
+import java.net.URL;
 
 /**
  * Remove a share
@@ -74,7 +73,8 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(String.valueOf(mRemoteShareId));
 
             DeleteMethod deleteMethod = new DeleteMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString()));
+                    new URL(uriBuilder.build().toString())
+            );
 
             deleteMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index df4996f2..d199ac6b 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -29,12 +29,12 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -198,16 +198,12 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
                 formBodyBuilder.add(PARAM_PERMISSIONS, Integer.toString(mPermissions));
             }
 
-            FormBody formBody = formBodyBuilder.build();
-
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
-            PutMethod putMethod = new PutMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
-            );
+            PutMethod putMethod = new PutMethod(new URL(uriBuilder.build().toString()));
 
             putMethod.setRequestBody(formBodyBuilder.build());
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index fa389fd4..598d24c5 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -31,7 +31,6 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -39,6 +38,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.json.JSONObject;
 
+import java.net.URL;
 import java.util.ArrayList;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -129,9 +129,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
             uriBuilder.appendEncodedPath(OCS_ROUTE);    // avoid starting "/" in this method
             uriBuilder.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT);
 
-            GetMethod getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(uriBuilder.build().toString())
-            );
+            GetMethod getMethod = new GetMethod(new URL(uriBuilder.build().toString()));
 
             getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 55e2c55a..60041b07 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -29,9 +29,7 @@ import android.net.ConnectivityManager;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -40,17 +38,13 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.security.cert.CertPathValidatorException;
-import java.sql.Time;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 
-import okhttp3.HttpUrl;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED;
 
 /**
  * Checks if the server is valid and if the server supports the Share API
@@ -86,9 +80,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
         boolean retval = false;
         String baseUrlSt = client.getBaseUri().toString();
         try {
-            GetMethod getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(baseUrlSt + OwnCloudClient.STATUS_PATH)
-            );
+            GetMethod getMethod = new GetMethod(new URL(baseUrlSt + OwnCloudClient.STATUS_PATH));
 
             getMethod.setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
             getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
@@ -113,7 +105,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                         redirectedLocation.startsWith(HTTP_PREFIX)
                 );
 
-                getMethod = new GetMethod(HttpUrl.parse(redirectedLocation));
+                getMethod = new GetMethod(new URL(redirectedLocation));
                 getMethod.setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
                 getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 1d72b7cb..e6358442 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -27,7 +27,6 @@ package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -39,6 +38,7 @@ import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -81,15 +81,12 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
         ByteArrayOutputStream bos = null;
 
         try {
-            String url =
+            final String url =
                     client.getBaseUri() + NON_OFFICIAL_AVATAR_PATH +
                     client.getCredentials().getUsername() + "/" + mDimension;
-            ;
             Log_OC.d(TAG, "avatar URI: " + url);
 
-            getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(url)
-            );
+            getMethod = new GetMethod(new URL(url));
 
             int status = client.executeHttpMethod(getMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index 1eeea6fd..0af89e3b 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -26,7 +26,6 @@ package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -34,6 +33,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.json.JSONObject;
 
+import java.net.URL;
 import java.util.ArrayList;
 
 import okhttp3.Request;
@@ -77,9 +77,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 
-            GetMethod getMethod = new GetMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getBaseUri() + OCS_ROUTE)
-            );
+            GetMethod getMethod = new GetMethod(new URL(client.getBaseUri() + OCS_ROUTE));
 
             int status = client.executeHttpMethod(getMethod);
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 5dc16804..80ced859 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -29,7 +29,6 @@ package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.HttpUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
 import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -37,6 +36,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.net.URL;
 import java.util.ArrayList;
 
 import at.bitfire.dav4android.PropertyCollection;
@@ -89,7 +89,7 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
         try {
             PropfindMethod propfindMethod = new PropfindMethod(
-                    HttpUtils.stringUrlToHttpUrl(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
+                    new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DEPTH_0,
                     DavUtils.getQuotaPropSet()
             );

From 7bc9a885b0f0f7d283ea01b79ec121376eb28de3 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Mon, 9 Jul 2018 12:31:48 +0200
Subject: [PATCH 098/133] use compiletime polymorphism over runtime
 polymorphism

---
 .../oauth/OAuth2GetAccessTokenOperation.java  |  20 +-
 .../OAuth2RefreshAccessTokenOperation.java    |  21 +-
 .../lib/common/network/RedirectionPath.java   |   2 +-
 .../common/operations/RemoteOperation.java    | 302 ++++++++----------
 .../operations/RemoteOperationResult.java     |  72 +----
 .../files/CopyRemoteFileOperation.java        |  18 +-
 .../files/CreateRemoteFolderOperation.java    |  12 +-
 .../files/DownloadRemoteFileOperation.java    |   8 +-
 .../files/ExistenceCheckRemoteOperation.java  |   8 +-
 .../files/MoveRemoteFileOperation.java        |  18 +-
 .../files/ReadRemoteFileOperation.java        |  19 +-
 .../files/ReadRemoteFolderOperation.java      |  14 +-
 .../files/RemoveRemoteFileOperation.java      |   6 +-
 .../files/RenameRemoteFileOperation.java      |  16 +-
 .../files/UploadRemoteFileOperation.java      |  12 +-
 .../ChunkedUploadRemoteFileOperation.java     |   7 +-
 .../shares/CreateRemoteShareOperation.java    |  14 +-
 .../shares/GetRemoteShareOperation.java       |   8 +-
 .../shares/GetRemoteShareesOperation.java     |  14 +-
 .../GetRemoteSharesForFileOperation.java      |  14 +-
 .../shares/GetRemoteSharesOperation.java      |   4 +-
 .../shares/RemoveRemoteShareOperation.java    |   4 +-
 .../resources/shares/ShareParserResult.java   |  21 ++
 .../ShareToRemoteOperationResultParser.java   |  45 ++-
 .../shares/UpdateRemoteShareOperation.java    |  10 +-
 .../GetRemoteCapabilitiesOperation.java       |  19 +-
 .../status/GetRemoteStatusOperation.java      |  33 +-
 .../users/GetRemoteUserAvatarOperation.java   |  22 +-
 .../users/GetRemoteUserInfoOperation.java     |  15 +-
 .../users/GetRemoteUserQuotaOperation.java    |  18 +-
 30 files changed, 342 insertions(+), 454 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/resources/shares/ShareParserResult.java

diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
index 6d0e9b8c..a3cea994 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
@@ -32,22 +32,20 @@ import com.owncloud.android.lib.common.authentication.OwnCloudBasicCredentials;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 
 import org.json.JSONObject;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Map;
 
-import okhttp3.HttpUrl;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 
-public class OAuth2GetAccessTokenOperation extends RemoteOperation {
+public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, String>> {
     
     private String mGrantType;
     private String mCode;
@@ -84,7 +82,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+        RemoteOperationResult<Map<String, String>> result = null;
         
         try {
 
@@ -122,22 +120,20 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
                     mResponseParser.parseAccessTokenResult(tokenJson);
                 if (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
                         accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {
-                    result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);
+                    result = new RemoteOperationResult<>(ResultCode.OAUTH2_ERROR);
 
                 } else {
-                    result = new RemoteOperationResult(ResultCode.OK);
-                    ArrayList<Object> data = new ArrayList<>();
-                    data.add(accessTokenResult);
-                    result.setData(data);
+                    result = new RemoteOperationResult<>(ResultCode.OK);
+                    result.setData(accessTokenResult);
                 }
 
             } else {
-                result = new RemoteOperationResult(ResultCode.OK);
+                result = new RemoteOperationResult<>(ResultCode.OK);
                 client.exhaustResponse(postMethod.getResponseAsStream());
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             
         }
         return result;
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
index 7f182b49..5027301e 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
@@ -26,24 +26,22 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudBasicCredentials;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.json.JSONObject;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Map;
 
 import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
 
-import okhttp3.HttpUrl;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
+public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<String, String>> {
 
     private static final String TAG = OAuth2RefreshAccessTokenOperation.class.getSimpleName();
 
@@ -76,7 +74,7 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
+    protected RemoteOperationResult<Map<String, String>> run(OwnCloudClient client) {
 
         try {
 
@@ -115,21 +113,20 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation {
 
                 final Map<String, String> accessTokenResult =
                         mResponseParser.parseAccessTokenResult(tokenJson);
-                final ArrayList<Object> resultData = new ArrayList<>(1);
-                resultData.add(accessTokenResult);
-                final RemoteOperationResult result = new RemoteOperationResult(ResultCode.OK);
-                result.setData(resultData);
+
+                final RemoteOperationResult<Map<String, String>> result = new RemoteOperationResult<>(ResultCode.OK);
+                result.setData(accessTokenResult);
                 return (accessTokenResult.get(OAuth2Constants.KEY_ERROR) != null ||
                         accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
-                        ? new RemoteOperationResult(ResultCode.OAUTH2_ERROR)
+                        ? new RemoteOperationResult<>(ResultCode.OAUTH2_ERROR)
                         : result;
 
             } else {
-                return new RemoteOperationResult(postMethod);
+                return new RemoteOperationResult<>(postMethod);
             }
 
         } catch (Exception e) {
-            return new RemoteOperationResult(e);
+            return new RemoteOperationResult<>(e);
         }
     }
 
diff --git a/src/com/owncloud/android/lib/common/network/RedirectionPath.java b/src/com/owncloud/android/lib/common/network/RedirectionPath.java
index 5f1b67ce..3df629ac 100644
--- a/src/com/owncloud/android/lib/common/network/RedirectionPath.java
+++ b/src/com/owncloud/android/lib/common/network/RedirectionPath.java
@@ -36,7 +36,7 @@ import java.util.Arrays;
 
 /**
  * Aggregate saving the list of URLs followed in a sequence of redirections during the exceution of a
- * {@link com.owncloud.android.lib.common.operations.RemoteOperation}, and the status codes corresponding to all
+ * {@link RemoteOperation}, and the status codes corresponding to all
  * of them.
  *
  * The last status code saved corresponds to the first response not being a redirection, unless the sequence exceeds
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 365fcdcf..19c7517a 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -1,27 +1,3 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2017 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
 package com.owncloud.android.lib.common.operations;
 
 import android.accounts.Account;
@@ -41,16 +17,7 @@ import java.io.IOException;
 
 import okhttp3.OkHttpClient;
 
-
-/**
- * Operation which execution involves one or several interactions with an ownCloud server.
- *
- * Provides methods to onExecute the operation both synchronously or asynchronously.
- *
- * @author David A. Velasco
- * @author David González Verdugo
- */
-public abstract class RemoteOperation implements Runnable {
+public abstract class RemoteOperation<T extends Object> implements Runnable {
 
     private static final String TAG = RemoteOperation.class.getSimpleName();
 
@@ -67,106 +34,32 @@ public abstract class RemoteOperation implements Runnable {
     /**
      * ownCloud account in the remote ownCloud server to operate
      */
-    private Account mAccount = null;
+    protected Account mAccount = null;
 
     /**
      * Android Application context
      */
-    private Context mContext = null;
+    protected Context mContext = null;
 
     /**
      * Object to interact with the remote server
      */
-    private OwnCloudClient mClient = null;
+    protected OwnCloudClient mClient = null;
 
     /**
      * Object to interact with the remote server
      */
-    private OkHttpClient mHttpClient = null;
+    protected OkHttpClient mHttpClient = null;
 
     /**
      * Callback object to notify about the execution of the remote operation
      */
-    private OnRemoteOperationListener mListener = null;
+    protected OnRemoteOperationListener mListener = null;
 
     /**
      * Handler to the thread where mListener methods will be called
      */
-    private Handler mListenerHandler = null;
-
-    /**
-     * Abstract method to implement the operation in derived classes.
-     */
-    protected abstract RemoteOperationResult run(OwnCloudClient client);
-
-
-    /**
-     * Synchronously executes the remote operation on the received ownCloud account.
-     *
-     * Do not call this method from the main thread.
-     *
-     * This method should be used whenever an ownCloud account is available, instead of
-     * {@link #execute(OwnCloudClient)}.
-     *
-     * @param account ownCloud account in remote ownCloud server to reach during the
-     *                execution of the operation.
-     * @param context Android context for the component calling the method.
-     * @return Result of the operation.
-     */
-    public RemoteOperationResult execute(Account account, Context context) {
-        if (account == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
-                    "Account");
-        if (context == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
-                    "Context");
-        mAccount = account;
-        mContext = context.getApplicationContext();
-
-        return runOperation();
-    }
-
-
-    /**
-     * Synchronously executes the remote operation
-     *
-     * Do not call this method from the main thread.
-     *
-     * @param client Client object to reach an ownCloud server during the execution of
-     *               the operation.
-     * @return Result of the operation.
-     */
-    public RemoteOperationResult execute(OwnCloudClient client) {
-        if (client == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
-                    "OwnCloudClient");
-        mClient = client;
-        if (client.getAccount() != null) {
-            mAccount = client.getAccount().getSavedAccount();
-        }
-        mContext = client.getContext();
-
-        return runOperation();
-    }
-
-    /**
-     * Synchronously executes the remote operation
-     *
-     * Do not call this method from the main thread.
-     *
-     * @param client Client object to reach an ownCloud server during the execution of
-     *               the operation.
-     * @return Result of the operation.
-     */
-    public RemoteOperationResult execute(OkHttpClient client, Context context) {
-        if (client == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
-                    "OwnCloudClient");
-        mHttpClient = client;
-        mContext = context;
-
-        return runOperation();
-    }
+    protected Handler mListenerHandler = null;
 
 
     /**
@@ -245,6 +138,127 @@ public abstract class RemoteOperation implements Runnable {
         return runnerThread;
     }
 
+    protected void grantOwnCloudClient() throws
+            AccountUtils.AccountNotFoundException, OperationCanceledException, AuthenticatorException, IOException {
+        if (mClient == null) {
+            if (mAccount != null && mContext != null) {
+                OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
+                mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                        getClientFor(ocAccount, mContext);
+
+            } else {
+                throw new IllegalStateException("Trying to run a remote operation " +
+                        "asynchronously with no client and no chance to create one (no account)");
+            }
+        }
+    }
+
+    /**
+     * Returns the current client instance to access the remote server.
+     *
+     * @return Current client instance to access the remote server.
+     */
+    public final OwnCloudClient getClient() {
+        return mClient;
+    }
+
+    /**
+     * Abstract method to implement the operation in derived classes.
+     */
+    protected abstract RemoteOperationResult<T> run(OwnCloudClient client);
+
+    /**
+     * Synchronously executes the remote operation on the received ownCloud account.
+     *
+     * Do not call this method from the main thread.
+     *
+     * This method should be used whenever an ownCloud account is available, instead of
+     * {@link #execute(OwnCloudClient)}.
+     *
+     * @param account ownCloud account in remote ownCloud server to reach during the
+     *                execution of the operation.
+     * @param context Android context for the component calling the method.
+     * @return Result of the operation.
+     */
+    public RemoteOperationResult<T> execute(Account account, Context context) {
+        if (account == null)
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+                    "Account");
+        if (context == null)
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+                    "Context");
+        mAccount = account;
+        mContext = context.getApplicationContext();
+
+        return runOperation();
+    }
+
+
+    /**
+     * Synchronously executes the remote operation
+     *
+     * Do not call this method from the main thread.
+     *
+     * @param client Client object to reach an ownCloud server during the execution of
+     *               the operation.
+     * @return Result of the operation.
+     */
+    public RemoteOperationResult<T> execute(OwnCloudClient client) {
+        if (client == null)
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+                    "OwnCloudClient");
+        mClient = client;
+        if (client.getAccount() != null) {
+            mAccount = client.getAccount().getSavedAccount();
+        }
+        mContext = client.getContext();
+
+        return runOperation();
+    }
+
+    /**
+     * Synchronously executes the remote operation
+     *
+     * Do not call this method from the main thread.
+     *
+     * @param client Client object to reach an ownCloud server during the execution of
+     *               the operation.
+     * @return Result of the operation.
+     */
+    public RemoteOperationResult<T> execute(OkHttpClient client, Context context) {
+        if (client == null)
+            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+                    "OwnCloudClient");
+        mHttpClient = client;
+        mContext = context;
+
+        return runOperation();
+    }
+
+    /**
+     * Run operation for asynchronous or synchronous 'onExecute' method.
+     *
+     * Considers and performs silent refresh of account credentials if possible, and if
+     * {@link RemoteOperation#setSilentRefreshOfAccountCredentials(boolean)} was called with
+     * parameter 'true' before the execution.
+     *
+     * @return      Remote operation result
+     */
+    private RemoteOperationResult<T> runOperation() {
+
+        RemoteOperationResult<T> result;
+
+        try {
+            grantOwnCloudClient();
+            result = run(mClient);
+
+        } catch (AccountsException | IOException e) {
+            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
+            result = new RemoteOperationResult<>(e);
+        }
+
+        return result;
+    }
 
     /**
      * Asynchronous execution of the operation
@@ -263,65 +277,11 @@ public abstract class RemoteOperation implements Runnable {
         }
 
         if (mListenerHandler != null && mListener != null) {
-            mListenerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend);
-                }
-            });
+            mListenerHandler.post(() ->
+                    mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend));
         } else if (mListener != null) {
             mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend);
         }
     }
 
-    /**
-     * Run operation for asynchronous or synchronous 'onExecute' method.
-     *
-     * Considers and performs silent refresh of account credentials if possible, and if
-     * {@link RemoteOperation#setSilentRefreshOfAccountCredentials(boolean)} was called with
-     * parameter 'true' before the execution.
-     *
-     * @return      Remote operation result
-     */
-    private RemoteOperationResult runOperation() {
-
-        RemoteOperationResult result;
-
-        try {
-            grantOwnCloudClient();
-            result = run(mClient);
-
-        } catch (AccountsException | IOException e) {
-            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
-            result = new RemoteOperationResult(e);
-        }
-
-        return result;
-    }
-
-
-    private void grantOwnCloudClient() throws
-        AccountUtils.AccountNotFoundException, OperationCanceledException, AuthenticatorException, IOException {
-        if (mClient == null) {
-            if (mAccount != null && mContext != null) {
-                OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
-                mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                    getClientFor(ocAccount, mContext);
-
-            } else {
-                throw new IllegalStateException("Trying to run a remote operation " +
-                    "asynchronously with no client and no chance to create one (no account)");
-            }
-        }
-    }
-
-    /**
-     * Returns the current client instance to access the remote server.
-     *
-     * @return Current client instance to access the remote server.
-     */
-    public final OwnCloudClient getClient() {
-        return mClient;
-    }
-
-}
\ No newline at end of file
+}
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 6b20f69a..efed8ef4 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -1,33 +1,9 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
 package com.owncloud.android.lib.common.operations;
 
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
-import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
@@ -55,21 +31,8 @@ import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import okhttp3.Headers;
 
-
-
-
-
-
-/**
- * The result of a remote operation required to an ownCloud server.
- *
- * Provides a common classification of remote operation results for all the
- * application.
- *
- * @author David A. Velasco
- * @author David González Verdugo
- */
-public class RemoteOperationResult implements Serializable {
+public class RemoteOperationResult<T extends Object>
+        implements Serializable {
 
     /**
      * Generated - should be refreshed every time the class changes!!
@@ -139,8 +102,7 @@ public class RemoteOperationResult implements Serializable {
     private String mRedirectedLocation;
     private ArrayList<String> mAuthenticate = new ArrayList<>();
     private String mLastPermanentLocation = null;
-
-    private ArrayList<Object> mData;
+    private T mData = null;
 
     /**
      * Public constructor from result code.
@@ -154,7 +116,6 @@ public class RemoteOperationResult implements Serializable {
         mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL ||
                 code == ResultCode.OK_NO_SSL ||
                 code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION);
-        mData = null;
     }
 
     /**
@@ -184,7 +145,7 @@ public class RemoteOperationResult implements Serializable {
         } else if (e instanceof UnknownHostException) {
             mCode = ResultCode.HOST_NOT_AVAILABLE;
 
-        } else if (e instanceof AccountNotFoundException) {
+        } else if (e instanceof AccountUtils.AccountNotFoundException) {
             mCode = ResultCode.ACCOUNT_NOT_FOUND;
 
         } else if (e instanceof AccountsException) {
@@ -332,7 +293,7 @@ public class RemoteOperationResult implements Serializable {
         }
         if (isIdPRedirection()) {
             // overrides default ResultCode.UNKNOWN
-            mCode = com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.UNAUTHORIZED;
+            mCode = ResultCode.UNAUTHORIZED;
         }
     }
 
@@ -382,13 +343,6 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
-    public void setData(ArrayList<Object> items) {
-        mData = items;
-    }
-
-    public ArrayList<Object> getData() {
-        return mData;
-    }
 
     public boolean isSuccess() {
         return mSuccess;
@@ -476,9 +430,9 @@ public class RemoteOperationResult implements Serializable {
             } else if (mException instanceof IOException) {
                 return "Unrecovered transport exception";
 
-            } else if (mException instanceof AccountNotFoundException) {
+            } else if (mException instanceof AccountUtils.AccountNotFoundException) {
                 Account failedAccount =
-                        ((AccountNotFoundException) mException).getFailedAccount();
+                        ((AccountUtils.AccountNotFoundException) mException).getFailedAccount();
                 return mException.getMessage() + " (" +
                         (failedAccount != null ? failedAccount.name : "NULL") + ")";
 
@@ -575,4 +529,12 @@ public class RemoteOperationResult implements Serializable {
     public void setSuccess(boolean success) {
         this.mSuccess = success;
     }
-}
\ No newline at end of file
+
+    public void setData(T data) {
+        mData = data;
+    }
+
+    public T getData() {
+        return mData;
+    }
+}
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index cc0d9228..eb875051 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -30,16 +30,14 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.CopyMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.HttpUrl;
-
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
  * in the same account.
@@ -89,16 +87,16 @@ public class CopyRemoteFileOperation extends RemoteOperation {
 
         /// check parameters
         if (!FileUtils.isValidPath(mTargetRemotePath, versionWithForbiddenChars)) {
-            return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
+            return new RemoteOperationResult<>(ResultCode.INVALID_CHARACTER_IN_NAME);
         }
 
         if (mTargetRemotePath.equals(mSrcRemotePath)) {
             // nothing to do!
-            return new RemoteOperationResult(ResultCode.OK);
+            return new RemoteOperationResult<>(ResultCode.OK);
         }
 
         if (mTargetRemotePath.startsWith(mSrcRemotePath)) {
-            return new RemoteOperationResult(ResultCode.INVALID_COPY_INTO_DESCENDANT);
+            return new RemoteOperationResult<>(ResultCode.INVALID_COPY_INTO_DESCENDANT);
         }
 
         /// perform remote operation
@@ -114,10 +112,10 @@ public class CopyRemoteFileOperation extends RemoteOperation {
             final int status = client.executeHttpMethod(copyMethod);
 
             if(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) {
-                result = new RemoteOperationResult(ResultCode.OK);
+                result = new RemoteOperationResult<>(ResultCode.OK);
             } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
 
-                result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
+                result = new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
                 client.exhaustResponse(copyMethod.getResponseAsStream());
 
 
@@ -125,7 +123,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
                 /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
 
             } else {
-                result = new RemoteOperationResult(copyMethod);
+                result = new RemoteOperationResult<>(copyMethod);
                 client.exhaustResponse(copyMethod.getResponseAsStream());
             }
 
@@ -133,7 +131,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
                     result.getLogMessage());
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log.e(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
                     result.getLogMessage(), e);
         }
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index eb85b53a..7d4095bc 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -31,17 +31,15 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.MkColMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.HttpUrl;
-
 
 /**
  * Remote operation performing the creation of a new folder in the ownCloud server.
@@ -94,7 +92,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
             }
 
         } else {
-            result = new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
+            result = new RemoteOperationResult<>(ResultCode.INVALID_CHARACTER_IN_NAME);
         }
 
         return result;
@@ -111,13 +109,13 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
             final int status = client.executeHttpMethod(mkcol);
 
             result = (status == HttpConstants.HTTP_CREATED)
-                    ? new RemoteOperationResult(ResultCode.OK)
-                    : new RemoteOperationResult(mkcol);
+                    ? new RemoteOperationResult<>(ResultCode.OK)
+                    : new RemoteOperationResult<>(mkcol);
             Log_OC.d(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage());
             client.exhaustResponse(mkcol.getResponseAsStream());
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage(), e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 0e1493ae..4902b584 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -44,8 +44,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import okhttp3.HttpUrl;
-
 /**
  * Remote operation performing the download of a remote file in the ownCloud server.
  *
@@ -88,7 +86,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                 result.getLogMessage());
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Download of " + mRemotePath + " to " + getTmpPath() + ": " +
                 result.getLogMessage(), e);
         }
@@ -172,8 +170,8 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
             } // else, body read by RemoteOperationResult constructor
 
             result = isSuccess(status)
-                    ? new RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
-                    : new RemoteOperationResult(mGet);
+                    ? new RemoteOperationResult<>(RemoteOperationResult.ResultCode.OK)
+                    : new RemoteOperationResult<>(mGet);
         } finally {
             if (fos != null) fos.close();
             if (bis != null) bis.close();
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index c94b2029..8e733995 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -102,19 +102,17 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     "finished with HTTP status " + status + (!isSuccess(status) ? "(FAIL)" : ""));
 
             return isSuccess(status)
-                    ? new RemoteOperationResult(OK)
-                    : new RemoteOperationResult(propfindMethod);
+                    ? new RemoteOperationResult<>(OK)
+                    : new RemoteOperationResult<>(propfindMethod);
 
         } catch (Exception e) {
-            final RemoteOperationResult result = new RemoteOperationResult(e);
+            final RemoteOperationResult result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Existence check for " + client.getNewFilesWebDavUri() +
                     WebdavUtils.encodePath(mPath) + " targeting for " +
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());
             return result;
-
         }
-
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 04628f10..df115b78 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -31,16 +31,14 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.HttpUrl;
-
 /**
  * Remote operation moving a remote file or folder in the ownCloud server to a different folder
  * in the same account.
@@ -96,16 +94,16 @@ public class MoveRemoteFileOperation extends RemoteOperation {
 
         /// check parameters
         if (!FileUtils.isValidPath(mTargetRemotePath, versionWithForbiddenChars)) {
-            return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
+            return new RemoteOperationResult<>(ResultCode.INVALID_CHARACTER_IN_NAME);
         }
 
         if (mTargetRemotePath.equals(mSrcRemotePath)) {
             // nothing to do!
-            return new RemoteOperationResult(ResultCode.OK);
+            return new RemoteOperationResult<>(ResultCode.OK);
         }
 
         if (mTargetRemotePath.startsWith(mSrcRemotePath)) {
-            return new RemoteOperationResult(ResultCode.INVALID_MOVE_INTO_DESCENDANT);
+            return new RemoteOperationResult<>(ResultCode.INVALID_MOVE_INTO_DESCENDANT);
         }
 
         /// perform remote operation
@@ -132,17 +130,17 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             final int status = client.executeHttpMethod(move);
             /// process response
             if(isSuccess(status)) {
-                result = new RemoteOperationResult(ResultCode.OK);
+                result = new RemoteOperationResult<>(ResultCode.OK);
             } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
 
-                result = new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
+                result = new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
                 client.exhaustResponse(move.getResponseAsStream());
 
                 /// for other errors that could be explicitly handled, check first:
                 /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
 
             } else {
-                result = new RemoteOperationResult(move);
+                result = new RemoteOperationResult<>(move);
                 client.exhaustResponse(move.getResponseAsStream());
             }
 
@@ -150,7 +148,7 @@ public class MoveRemoteFileOperation extends RemoteOperation {
                 result.getLogMessage());
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log.e(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
                 result.getLogMessage(), e);
         }
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 432dc1c5..7fe15d75 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -33,11 +33,9 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import at.bitfire.dav4android.DavResource;
-import okhttp3.HttpUrl;
 
 import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -49,7 +47,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author masensio
  */
 
-public class ReadRemoteFileOperation extends RemoteOperation {
+public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
 
     private static final String TAG = ReadRemoteFileOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
@@ -72,9 +70,9 @@ public class ReadRemoteFileOperation extends RemoteOperation {
      * @param client Client object to communicate with the remote ownCloud server.
      */
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
+    protected RemoteOperationResult<RemoteFile> run(OwnCloudClient client) {
         PropfindMethod propfind;
-        RemoteOperationResult result;
+        RemoteOperationResult<RemoteFile> result;
 
         /// take the duty of check the server for the current state of the file there
         try {
@@ -94,19 +92,16 @@ public class ReadRemoteFileOperation extends RemoteOperation {
 
                 final RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
 
-                ArrayList<Object> files = new ArrayList<>();
-                files.add(file);
-
-                result = new RemoteOperationResult(OK);
-                result.setData(files);
+                result = new RemoteOperationResult<>(OK);
+                result.setData(file);
 
             } else {
-                result = new RemoteOperationResult(propfind);
+                result = new RemoteOperationResult<>(propfind);
                 client.exhaustResponse(propfind.getResponseAsStream());
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             e.printStackTrace();
             Log_OC.e(TAG, "Synchronizing  file " + mRemotePath + ": " + result.getLogMessage(),
                 result.getException());
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index b54cbd0f..0d21d1d0 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -49,7 +49,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David González Verdugo
  */
 
-public class ReadRemoteFolderOperation extends RemoteOperation {
+public class ReadRemoteFolderOperation extends RemoteOperation<ArrayList<RemoteFile>> {
 
     private static final String TAG = ReadRemoteFolderOperation.class.getSimpleName();
 
@@ -70,8 +70,8 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
      * @param client Client object to communicate with the remote ownCloud server.
      */
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+    protected RemoteOperationResult<ArrayList<RemoteFile>> run(OwnCloudClient client) {
+        RemoteOperationResult<ArrayList<RemoteFile>> result = null;
 
         try {
             PropfindMethod propfindMethod = new PropfindMethod(
@@ -84,7 +84,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
             int status = client.executeHttpMethod(propfindMethod);
 
             if (isSuccess(status)) {
-                ArrayList<Object> mFolderAndFiles = new ArrayList<>();
+                ArrayList<RemoteFile> mFolderAndFiles = new ArrayList<>();
 
                 // parse data from remote folder
                 mFolderAndFiles.add(
@@ -98,15 +98,15 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
                 }
 
                 // Result of the operation
-                result = new RemoteOperationResult(OK);
+                result = new RemoteOperationResult<>(OK);
                 result.setData(mFolderAndFiles);
 
             } else { // synchronization failed
-                result = new RemoteOperationResult(propfindMethod);
+                result = new RemoteOperationResult<> (propfindMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
         } finally {
             if (result.isSuccess()) {
                 Log_OC.i(TAG, "Synchronized " + mRemotePath + ": " + result.getLogMessage());
diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 7be42e00..348108b7 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -78,13 +78,13 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
             int status = client.executeHttpMethod(deleteMethod);
 
             result = isSuccess(status) ?
-                    new RemoteOperationResult(OK) :
-                    new RemoteOperationResult(deleteMethod);
+                    new RemoteOperationResult<>(OK) :
+                    new RemoteOperationResult<>(deleteMethod);
 
             Log_OC.i(TAG, "Remove " + mRemotePath + ": " + result.getLogMessage());
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Remove " + mRemotePath + ": " + result.getLogMessage(), e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index b9f4de28..d5ab14e1 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -32,14 +32,12 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-import okhttp3.HttpUrl;
-
 
 /**
  * Remote operation performing the rename of a remote file or folder in the ownCloud server.
@@ -96,15 +94,15 @@ public class RenameRemoteFileOperation extends RemoteOperation {
             (version != null && version.isVersionWithForbiddenCharacters());
 
         if(!FileUtils.isValidPath(mNewRemotePath, versionWithForbiddenChars))
-            return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
+            return new RemoteOperationResult<>(ResultCode.INVALID_CHARACTER_IN_NAME);
 
         try {
             if (mNewName.equals(mOldName)) {
-                return new RemoteOperationResult(ResultCode.OK);
+                return new RemoteOperationResult<>(ResultCode.OK);
             }
 
             if (targetPathIsUsed(client)) {
-                return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);
+                return new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
             }
 
             final MoveMethod move = new MoveMethod(new URL(client.getNewFilesWebDavUri() +
@@ -117,8 +115,8 @@ public class RenameRemoteFileOperation extends RemoteOperation {
             final int status = client.executeHttpMethod(move);
             final RemoteOperationResult result =
                     (status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT)
-                            ? new RemoteOperationResult(ResultCode.OK)
-                            : new RemoteOperationResult(move);
+                            ? new RemoteOperationResult<>(ResultCode.OK)
+                            : new RemoteOperationResult<>(move);
 
             Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
                     result.getLogMessage()
@@ -126,7 +124,7 @@ public class RenameRemoteFileOperation extends RemoteOperation {
             client.exhaustResponse(move.getResponseAsStream());
             return result;
         } catch (Exception e) {
-            final RemoteOperationResult result = new RemoteOperationResult(e);
+            final RemoteOperationResult result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Rename " + mOldRemotePath + " to " +
                     ((mNewRemotePath == null) ? mNewName : mNewRemotePath) + ": " +
                     result.getLogMessage(), e);
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 1010371f..4027fa04 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -95,7 +95,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 
             if (mCancellationRequested.get()) {
                 // the operation was cancelled before getting it's turn to be executed in the queue of uploads
-                result = new RemoteOperationResult(new OperationCancelledException());
+                result = new RemoteOperationResult<>(new OperationCancelledException());
             } else {
                 // perform the upload
                 result = uploadFile(client);
@@ -106,11 +106,11 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         } catch (Exception e) {
 
             if (mPutMethod != null && mPutMethod.isAborted()) {
-                result = new RemoteOperationResult(new OperationCancelledException());
+                result = new RemoteOperationResult<>(new OperationCancelledException());
                 Log_OC.e(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " +
                         result.getLogMessage(), new OperationCancelledException());
             } else {
-                result = new RemoteOperationResult(e);
+                result = new RemoteOperationResult<>(e);
                 Log_OC.e(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " +
                         result.getLogMessage(), e);
             }
@@ -119,7 +119,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         return result;
     }
 
-    protected RemoteOperationResult uploadFile(OwnCloudClient client) throws Exception {
+    protected RemoteOperationResult<? extends Object> uploadFile(OwnCloudClient client) throws Exception {
 
         File fileToUpload = new File(mLocalPath);
 
@@ -144,10 +144,10 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         int status = client.executeHttpMethod(mPutMethod);
 
         if (isSuccess(status)) {
-            return new RemoteOperationResult(OK);
+            return new RemoteOperationResult<>(OK);
 
         } else { // synchronization failed
-            return new RemoteOperationResult(mPutMethod);
+            return new RemoteOperationResult<>(mPutMethod);
         }
     }
 
diff --git a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index c14a6f88..f50025f1 100644
--- a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -43,6 +43,7 @@ import okhttp3.MediaType;
 
 import static com.owncloud.android.lib.common.http.HttpConstants.IF_MATCH_HEADER;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
  * Remote operation performing the chunked upload of a remote file to the ownCloud server.
@@ -100,7 +101,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
             ((ChunkFromFileRequestBody) mFileRequestBody).setOffset(offset);
 
             if (mCancellationRequested.get()) {
-                result = new RemoteOperationResult(new OperationCancelledException());
+                result = new RemoteOperationResult<>(new OperationCancelledException());
                 break;
             } else {
                 if (chunkIndex == chunkCount - 1) {
@@ -119,9 +120,9 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                         ", HTTP result status " + status);
 
                 if (isSuccess(status)) {
-                    result = new RemoteOperationResult(OK);
+                    result = new RemoteOperationResult<>(OK);
                 } else {
-                    result = new RemoteOperationResult(mPutMethod);
+                    result = new RemoteOperationResult<>(mPutMethod);
                     break;
                 }
             }
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 8caace0b..e6d2dbad 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -186,17 +186,13 @@ public class CreateRemoteShareOperation extends RemoteOperation {
         mPublicUpload = publicUpload;
     }
 
-    public boolean isGettingShareDetails() {
-        return mGetShareDetails;
-    }
-
     public void setGetShareDetails(boolean set) {
         mGetShareDetails = set;
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+    protected RemoteOperationResult<ShareParserResult> run(OwnCloudClient client) {
+        RemoteOperationResult<ShareParserResult> result;
 
         try {
             FormBody.Builder formBodyBuilder = new FormBody.Builder()
@@ -253,7 +249,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
                     // TODO Use executeHttpMethod
                     // retrieve more info - POST only returns the index of the new share
-                    OCShare emptyShare = (OCShare) result.getData().get(0);
+                    OCShare emptyShare = result.getData().getShares().get(0);
                     GetRemoteShareOperation getInfo = new GetRemoteShareOperation(
                             emptyShare.getRemoteId()
                     );
@@ -261,11 +257,11 @@ public class CreateRemoteShareOperation extends RemoteOperation {
                 }
 
             } else {
-                result = new RemoteOperationResult(postMethod);
+                result = new RemoteOperationResult<>(postMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while Creating New Share", e);
         }
         return result;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index 3945c506..3c54cb7a 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -44,7 +44,7 @@ import java.net.URL;
  * @author David González Verdugo
  */
 
-public class GetRemoteShareOperation extends RemoteOperation {
+public class GetRemoteShareOperation extends RemoteOperation<ShareParserResult> {
 
     private static final String TAG = GetRemoteShareOperation.class.getSimpleName();
 
@@ -57,7 +57,7 @@ public class GetRemoteShareOperation extends RemoteOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+        RemoteOperationResult<ShareParserResult> result;
 
         try {
             Uri requestUri = client.getBaseUri();
@@ -83,11 +83,11 @@ public class GetRemoteShareOperation extends RemoteOperation {
                 result = parser.parse(getMethod.getResponseBodyAsString());
 
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting remote shares ", e);
         }
         return result;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 0574ba1a..006ac719 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -70,7 +70,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David A. Velasco
  * @author David González Verdugo
  */
-public class GetRemoteShareesOperation extends RemoteOperation{
+public class GetRemoteShareesOperation extends RemoteOperation<ArrayList<JSONObject>> {
 
     private static final String TAG = GetRemoteShareesOperation.class.getSimpleName();
 
@@ -118,8 +118,8 @@ public class GetRemoteShareesOperation extends RemoteOperation{
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+    protected RemoteOperationResult<ArrayList<JSONObject>> run(OwnCloudClient client) {
+        RemoteOperationResult<ArrayList<JSONObject>> result;
 
         try{
             Uri requestUri = client.getBaseUri();
@@ -161,7 +161,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
                         respPartialRemotes
                 };
 
-                ArrayList<Object> data = new ArrayList<Object>(); // For result data
+                ArrayList<JSONObject> data = new ArrayList<>(); // For result data
                 for (int i=0; i<6; i++) {
                     for(int j=0; j< jsonResults[i].length(); j++){
                         JSONObject jsonResult = jsonResults[i].getJSONObject(j);
@@ -170,13 +170,13 @@ public class GetRemoteShareesOperation extends RemoteOperation{
                     }
                 }
 
-                result = new RemoteOperationResult(OK);
+                result = new RemoteOperationResult<>(OK);
                 result.setData(data);
 
                 Log_OC.d(TAG, "*** Get Users or groups completed " );
 
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
                 Log_OC.e(TAG, "Failed response while getting users/groups from the server ");
                 if (response != null) {
                     Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
@@ -185,7 +185,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
                 }
             }
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting users/groups", e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index 18409152..aadbad3e 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -38,8 +38,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.net.URL;
 
-import okhttp3.HttpUrl;
-
 /**
  * Provide a list shares for a specific file.
  * The input is the full path of the desired file.
@@ -49,7 +47,7 @@ import okhttp3.HttpUrl;
  * @author David A. Velasco
  * @author David González Verdugo
  */
-public class GetRemoteSharesForFileOperation extends RemoteOperation {
+public class GetRemoteSharesForFileOperation extends RemoteOperation<ShareParserResult> {
 
     private static final String TAG = GetRemoteSharesForFileOperation.class.getSimpleName();
 
@@ -79,8 +77,8 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+    protected RemoteOperationResult<ShareParserResult> run(OwnCloudClient client) {
+        RemoteOperationResult<ShareParserResult> result;
 
         try {
 
@@ -107,13 +105,13 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
                 result = parser.parse(getMethod.getResponseBodyAsString());
 
                 if (result.isSuccess()) {
-                    Log_OC.d(TAG, "Got " + result.getData().size() + " shares");
+                    Log_OC.d(TAG, "Got " + result.getData().getShares().size() + " shares");
                 }
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
             }
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting shares", e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 28bd93d5..f1544cf7 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -75,10 +75,10 @@ public class GetRemoteSharesOperation extends RemoteOperation {
                 parser.setServerBaseUri(client.getBaseUri());
                 result = parser.parse(getMethod.getResponseBodyAsString());
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
             }
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting remote shares ", e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index fb53f57b..749028e1 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -91,11 +91,11 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
                 Log_OC.d(TAG, "Unshare " + mRemoteShareId + ": " + result.getLogMessage());
 
             } else {
-                result = new RemoteOperationResult(deleteMethod);
+                result = new RemoteOperationResult<>(deleteMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Unshare Link Exception " + result.getLogMessage(), e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java b/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java
new file mode 100644
index 00000000..75dea43c
--- /dev/null
+++ b/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java
@@ -0,0 +1,21 @@
+package com.owncloud.android.lib.resources.shares;
+
+import java.util.ArrayList;
+
+public class ShareParserResult {
+    private ArrayList<OCShare> shares;
+    private String parserMessage;
+
+    public ShareParserResult(ArrayList<OCShare> shares, String parserMessage) {
+        this.shares = shares;
+        this.parserMessage = parserMessage;
+    }
+
+    public ArrayList<OCShare> getShares() {
+        return shares;
+    }
+
+    public String getParserMessage() {
+        return parserMessage;
+    }
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java b/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
index 45fcb186..9f9d84b1 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
@@ -66,13 +66,13 @@ public class ShareToRemoteOperationResultParser {
         mServerBaseUri = serverBaseURi;
     }
 
-    public RemoteOperationResult parse(String serverResponse) {
+    public RemoteOperationResult<ShareParserResult> parse(String serverResponse) {
         if (serverResponse == null || serverResponse.length() == 0) {
-            return new RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
+            return new RemoteOperationResult<>(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
         }
 
-        RemoteOperationResult result;
-        ArrayList<Object> resultData = new ArrayList<Object>();
+        RemoteOperationResult<ShareParserResult> result;
+        final ArrayList<OCShare> resultData = new ArrayList<>();
 
         try {
             // Parse xml response and obtain the list of shares
@@ -85,17 +85,16 @@ public class ShareToRemoteOperationResultParser {
 
             if (mShareXmlParser.isSuccess()) {
                 if ((shares != null && shares.size() > 0) || !mOneOrMoreSharesRequired) {
-                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK);
+                    result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.OK);
                     if (shares != null) {
                         for (OCShare share : shares) {
                             resultData.add(share);
                             // build the share link if not in the response
                             // (needed for OC servers < 9.0.0, see ShareXMLParser.java#line256)
-                            if (share.getShareType() == ShareType.PUBLIC_LINK &&
-                                    (share.getShareLink() == null ||
-                                            share.getShareLink().length() <= 0) &&
-                                    share.getToken().length() > 0
-                                    ) {
+                            if (share.getShareType() == ShareType.PUBLIC_LINK
+                                    && (share.getShareLink() == null
+                                        || share.getShareLink().length() <= 0)
+                                    && share.getToken().length() > 0) {
                                 if (mServerBaseUri != null) {
                                     String sharingLinkPath = ShareUtils.getSharingLinkPath(mOwnCloudVersion);
                                     share.setShareLink(mServerBaseUri + sharingLinkPath + share.getToken());
@@ -105,40 +104,36 @@ public class ShareToRemoteOperationResultParser {
                             }
                         }
                     }
-                    result.setData(resultData);
+                    result.setData(new ShareParserResult(resultData, ""));
 
                 } else {
-                    result = new RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
+                    result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
                     Log_OC.e(TAG, "Successful status with no share in the response");
                 }
 
             } else if (mShareXmlParser.isWrongParameter()){
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_WRONG_PARAMETER);
-                resultData.add(mShareXmlParser.getMessage());
-                result.setData(resultData);
+                result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.SHARE_WRONG_PARAMETER);
+                result.setData(new ShareParserResult(null, mShareXmlParser.getMessage()));
 
             } else if (mShareXmlParser.isNotFound()){
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
-                resultData.add(mShareXmlParser.getMessage());
-                result.setData(resultData);
+                result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
+                result.setData(new ShareParserResult(null, mShareXmlParser.getMessage()));
 
             } else if (mShareXmlParser.isForbidden()) {
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_FORBIDDEN);
-                resultData.add(mShareXmlParser.getMessage());
-                result.setData(resultData);
+                result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.SHARE_FORBIDDEN);
+                result.setData(new ShareParserResult(null, mShareXmlParser.getMessage()));
 
             } else {
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
-
+                result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
             }
 
         } catch (XmlPullParserException e) {
             Log_OC.e(TAG, "Error parsing response from server ", e);
-            result = new RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
+            result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
 
         } catch (IOException e) {
             Log_OC.e(TAG, "Error reading response from server ", e);
-            result = new RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
+            result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
         }
 
         return result;
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index d199ac6b..6f93259b 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -51,7 +51,7 @@ import okhttp3.FormBody;
  * @author David González Verdugo
  */
 
-public class UpdateRemoteShareOperation extends RemoteOperation {
+public class UpdateRemoteShareOperation extends RemoteOperation<ShareParserResult> {
 
     private static final String TAG = GetRemoteShareOperation.class.getSimpleName();
 
@@ -163,8 +163,8 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+    protected RemoteOperationResult<ShareParserResult> run(OwnCloudClient client) {
+        RemoteOperationResult<ShareParserResult> result;
 
         try {
             FormBody.Builder formBodyBuilder = new FormBody.Builder();
@@ -222,11 +222,11 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
                 result = parser.parse(putMethod.getResponseBodyAsString());
 
             } else {
-                result = new RemoteOperationResult(putMethod);
+                result = new RemoteOperationResult<>(putMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while Creating New Share", e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 598d24c5..bbe0faa6 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -39,7 +39,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.json.JSONObject;
 
 import java.net.URL;
-import java.util.ArrayList;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -50,7 +49,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author masensio
  * @author David González Verdugo
  */
-public class GetRemoteCapabilitiesOperation extends RemoteOperation {
+public class GetRemoteCapabilitiesOperation extends RemoteOperation<OCCapability> {
 
     private static final String TAG = GetRemoteCapabilitiesOperation.class.getSimpleName();
 
@@ -120,8 +119,8 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+    protected RemoteOperationResult<OCCapability> run(OwnCloudClient client) {
+        RemoteOperationResult<OCCapability> result;
 
         try {
             Uri requestUri = client.getBaseUri();
@@ -151,7 +150,6 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
                 String message = respMeta.getString(PROPERTY_MESSAGE);
 
                 if (statusProp) {
-                    ArrayList<Object> data = new ArrayList<Object>(); // For result data
                     OCCapability capability = new OCCapability();
                     // Add Version
                     if (respData.has(NODE_VERSION)) {
@@ -257,19 +255,18 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
                         }
                     }
                     // Result
-                    data.add(capability);
-                    result = new RemoteOperationResult(OK);
-                    result.setData(data);
+                    result = new RemoteOperationResult<>(OK);
+                    result.setData(capability);
 
                     Log_OC.d(TAG, "*** Get Capabilities completed ");
                 } else {
-                    result = new RemoteOperationResult(statuscode, message, null);
+                    result = new RemoteOperationResult<>(statuscode, message, null);
                     Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
                     Log_OC.e(TAG, "*** status: " + statusProp + "; message: " + message);
                 }
 
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
                 Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
                 if (response != null) {
                     Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
@@ -279,7 +276,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting capabilities", e);
         }
         return result;
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 60041b07..bd5641f3 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -39,7 +39,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
@@ -54,7 +53,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David González Verdugo
  */
 
-public class GetRemoteStatusOperation extends RemoteOperation {
+public class GetRemoteStatusOperation extends RemoteOperation<OwnCloudVersion> {
 
     /**
      * Maximum time to wait for a response from the server when the connection is being tested,
@@ -69,7 +68,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
     private static final String HTTPS_PREFIX = "https://";
     private static final String HTTP_PREFIX = "http://";
 
-    private RemoteOperationResult mLatestResult;
+    private RemoteOperationResult<OwnCloudVersion> mLatestResult;
     private Context mContext;
 
     public GetRemoteStatusOperation(Context context) {
@@ -110,7 +109,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                 getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
 
                 status = client.executeHttpMethod(getMethod);
-                mLatestResult = new RemoteOperationResult(getMethod);
+                mLatestResult = new RemoteOperationResult<>(getMethod);
                 redirectedLocation = mLatestResult.getRedirectedLocation();
             }
 
@@ -119,7 +118,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                 JSONObject respJSON = new JSONObject(getMethod.getResponseBodyAsString());
                 if (!respJSON.getBoolean(NODE_INSTALLED)) {
                     mLatestResult = new RemoteOperationResult(
-                        RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
+                            RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
                 } else {
                     String version = respJSON.getString(NODE_VERSION);
                     OwnCloudVersion ocVersion = new OwnCloudVersion(version);
@@ -127,34 +126,30 @@ public class GetRemoteStatusOperation extends RemoteOperation {
                     /// every app will decide how to act if (ocVersion.isVersionValid() == false)
 
                     if (isRedirectToNonSecureConnection) {
-                        mLatestResult = new RemoteOperationResult(
+                        mLatestResult = new RemoteOperationResult<>(
                             RemoteOperationResult.ResultCode.
-                                OK_REDIRECT_TO_NON_SECURE_CONNECTION
-                        );
+                                OK_REDIRECT_TO_NON_SECURE_CONNECTION);
                     } else {
-                        mLatestResult = new RemoteOperationResult(
+                        mLatestResult = new RemoteOperationResult<>(
                             baseUrlSt.startsWith(HTTPS_PREFIX) ?
                                 RemoteOperationResult.ResultCode.OK_SSL :
-                                RemoteOperationResult.ResultCode.OK_NO_SSL
-                        );
+                                RemoteOperationResult.ResultCode.OK_NO_SSL);
                     }
 
-                    ArrayList<Object> data = new ArrayList<>();
-                    data.add(ocVersion);
-                    mLatestResult.setData(data);
+                    mLatestResult.setData(ocVersion);
                     retval = true;
                 }
 
             } else {
-                mLatestResult = new RemoteOperationResult(getMethod);
+                mLatestResult = new RemoteOperationResult<>(getMethod);
             }
 
         } catch (JSONException e) {
-            mLatestResult = new RemoteOperationResult(
+            mLatestResult = new RemoteOperationResult<>(
                 RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
 
         } catch (Exception e) {
-            mLatestResult = new RemoteOperationResult(e);
+            mLatestResult = new RemoteOperationResult<>(e);
         }
 
         if (mLatestResult.isSuccess()) {
@@ -179,9 +174,9 @@ public class GetRemoteStatusOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
+    protected RemoteOperationResult<OwnCloudVersion> run(OwnCloudClient client) {
         if (!isOnline()) {
-            return new RemoteOperationResult(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
+            return new RemoteOperationResult<>(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
         }
         String baseUriStr = client.getBaseUri().toString();
         if (baseUriStr.startsWith(HTTP_PREFIX) || baseUriStr.startsWith(HTTPS_PREFIX)) {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index e6358442..fd4d343f 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -39,7 +39,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.ArrayList;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -50,7 +49,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David González Verdugo
  */
 
-public class GetRemoteUserAvatarOperation extends RemoteOperation {
+public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserAvatarOperation.ResultData> {
 
     private static final String TAG = GetRemoteUserAvatarOperation.class.getSimpleName();
 
@@ -73,9 +72,9 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
+    protected RemoteOperationResult<ResultData> run(OwnCloudClient client) {
         GetMethod getMethod = null;
-        RemoteOperationResult result;
+        RemoteOperationResult<ResultData> result;
         InputStream inputStream = null;
         BufferedInputStream bis = null;
         ByteArrayOutputStream bos = null;
@@ -107,9 +106,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                     Log_OC.e(
                         TAG, "Not an image, failing with no avatar"
                     );
-                    result = new RemoteOperationResult(
-                        RemoteOperationResult.ResultCode.FILE_NOT_FOUND
-                    );
+                    result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.FILE_NOT_FOUND);
                     return result;
                 }
 
@@ -136,19 +133,16 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation {
                 }
 
                 // Result
-                result = new RemoteOperationResult(OK);
-                ResultData resultData = new ResultData(bos.toByteArray(), mimeType, etag);
-                ArrayList<Object> data = new ArrayList<Object>();
-                data.add(resultData);
-                result.setData(data);
+                result = new RemoteOperationResult<>(OK);
+                result.setData(new ResultData(bos.toByteArray(), mimeType, etag));
 
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
                 client.exhaustResponse(getMethod.getResponseAsStream());
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting OC user avatar", e);
 
         } finally {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index 0af89e3b..fba5c4b9 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -34,7 +34,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import org.json.JSONObject;
 
 import java.net.URL;
-import java.util.ArrayList;
 
 import okhttp3.Request;
 
@@ -67,8 +66,8 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
+    protected RemoteOperationResult<UserInfo> run(OwnCloudClient client) {
+        RemoteOperationResult<UserInfo> result;
 
         //Get the user
         try {
@@ -93,14 +92,12 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                 userInfo.mDisplayName = respData.getString(NODE_DISPLAY_NAME);
                 userInfo.mEmail = respData.getString(NODE_EMAIL);
 
-                result = new RemoteOperationResult(OK);
+                result = new RemoteOperationResult<>(OK);
 
-                ArrayList<Object> data = new ArrayList<>();
-                data.add(userInfo);
-                result.setData(data);
+                result.setData(userInfo);
 
             } else {
-                result = new RemoteOperationResult(getMethod);
+                result = new RemoteOperationResult<>(getMethod);
                 String response = getMethod.getResponseBodyAsString();
                 Log_OC.e(TAG, "Failed response while getting user information ");
                 if (getMethod != null) {
@@ -110,7 +107,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
                 }
             }
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting OC user information", e);
         }
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 80ced859..27b8330f 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -37,7 +37,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.net.URL;
-import java.util.ArrayList;
 
 import at.bitfire.dav4android.PropertyCollection;
 import at.bitfire.dav4android.property.QuotaAvailableBytes;
@@ -50,7 +49,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author marcello
  * @author David González Verdugo
  */
-public class GetRemoteUserQuotaOperation extends RemoteOperation {
+public class GetRemoteUserQuotaOperation extends RemoteOperation<GetRemoteUserQuotaOperation.RemoteQuota> {
 
     static public class RemoteQuota {
 
@@ -84,8 +83,8 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+    protected RemoteOperationResult<RemoteQuota> run(OwnCloudClient client) {
+        RemoteOperationResult<RemoteQuota> result = null;
 
         try {
             PropfindMethod propfindMethod = new PropfindMethod(
@@ -99,22 +98,19 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
             if (isSuccess(status)) {
                 RemoteQuota remoteQuota = readData(propfindMethod.getDavResource().getProperties());
 
-                result = new RemoteOperationResult(OK);
-
-                ArrayList<Object> data = new ArrayList<>();
-                data.add(remoteQuota);
+                result = new RemoteOperationResult<>(OK);
 
                 // Add data to the result
                 if (result.isSuccess()) {
-                    result.setData(data);
+                    result.setData(remoteQuota);
                 }
 
             } else { // synchronization failed
-                result = new RemoteOperationResult(propfindMethod);
+                result = new RemoteOperationResult<>(propfindMethod);
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
 
 
         } finally {

From 4968ca6e62fde1768a138d7e295f032573db8088 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Tue, 17 Jul 2018 09:31:39 +0200
Subject: [PATCH 099/133] make the new merged changes from bitfire compile

---
 build.gradle                                  |  1 +
 dav4android                                   |  2 +-
 .../android/lib/common/OwnCloudClient.java    |  1 +
 .../common/http/methods/HttpBaseMethod.java   |  2 +
 .../http/methods/webdav/CopyMethod.java       | 11 +--
 .../common/http/methods/webdav/DavMethod.java | 49 ++++++++-----
 .../http/methods/webdav/MkColMethod.java      | 11 +--
 .../http/methods/webdav/MoveMethod.java       | 12 ++--
 .../http/methods/webdav/PropfindMethod.java   | 59 +++++++++++-----
 .../common/http/methods/webdav/PutMethod.java | 15 ++--
 .../files/ReadRemoteFileOperation.java        |  5 +-
 .../files/ReadRemoteFolderOperation.java      |  5 +-
 .../lib/resources/files/RemoteFile.java       | 68 +++++++++++--------
 .../users/GetRemoteUserQuotaOperation.java    | 19 ++++--
 14 files changed, 164 insertions(+), 96 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0b0263c2..e6a9c02d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     // Used for network and database debuging
     debugApi 'com.facebook.stetho:stetho:1.5.0'
     debugApi 'com.facebook.stetho:stetho-okhttp3:1.5.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51"
 }
 
 android {
diff --git a/dav4android b/dav4android
index c6c06a14..da434d76 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit c6c06a144a1eaf3a75035dfe8700c42b86b0d223
+Subproject commit da434d7693db7d4cfd434ee22d0d336f37f4b6f8
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 79d45023..d67fee6e 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -36,6 +36,7 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
+import com.owncloud.android.lib.common.http.methods.webdav.CopyMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 7ea9b3e1..aaadcebf 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -52,9 +52,11 @@ public abstract class HttpBaseMethod {
     protected RequestBody mRequestBody;
     protected Response mResponse;
     protected Call mCall;
+    protected URL mUrl;
 
     protected HttpBaseMethod (URL url) {
         mOkHttpClient = HttpClient.getOkHttpClient();
+        mUrl = url;
         mRequest = new Request.Builder()
                 .url(HttpUrl.parse(url.toString()))
                 .build();
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
index c1978c52..ea79deaf 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
@@ -3,7 +3,10 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 import java.net.URL;
 
 import at.bitfire.dav4android.exception.UnauthorizedException;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 import okhttp3.HttpUrl;
+import okhttp3.Response;
 
 public class CopyMethod extends DavMethod {
 
@@ -19,10 +22,10 @@ public class CopyMethod extends DavMethod {
     @Override
     public int onExecute() throws Exception {
         try {
-            mDavResource.copy(destinationUrl, forceOverride);
-
-            mRequest = mDavResource.getRequest();
-            mResponse = mDavResource.getResponse();
+            mDavResource.copy(destinationUrl, forceOverride, response -> {
+                mResponse = response;
+                return Unit.INSTANCE;
+            });
 
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index f10a7ddb..1c827b88 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -30,6 +30,7 @@ import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
+import at.bitfire.dav4android.Constants;
 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.exception.RedirectException;
@@ -47,14 +48,14 @@ public abstract class DavMethod extends HttpBaseMethod {
         super(url);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                HttpUrl.parse(url.toString()));
-        mDavResource.setFollowRedirects(false);
+                HttpUrl.parse(mUrl.toString()),
+                Constants.INSTANCE.getLog());
     }
 
 
     @Override
     public void abort() {
-        mDavResource.cancelCall();
+        //TODO: abort here
     }
 
     @Override
@@ -62,7 +63,6 @@ public abstract class DavMethod extends HttpBaseMethod {
         try {
              return onExecute();
         } catch(RedirectException e) {
-            mResponse = getDavResource().getResponse();
             return getStatusCode();
         }
     }
@@ -74,22 +74,38 @@ public abstract class DavMethod extends HttpBaseMethod {
     // Connection parameters
     @Override
     public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
-        mDavResource.setReadTimeout(readTimeout, timeUnit);
+        super.setReadTimeout(readTimeout, timeUnit);
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                HttpUrl.parse(mUrl.toString()),
+                Constants.INSTANCE.getLog());
     }
 
     @Override
     public void setConnectionTimeout(long connectionTimeout, TimeUnit timeUnit) {
-        mDavResource.setConnectionTimeout(connectionTimeout, timeUnit);
+        super.setConnectionTimeout(connectionTimeout, timeUnit);
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                HttpUrl.parse(mUrl.toString()),
+                Constants.INSTANCE.getLog());
     }
 
     @Override
     public void setFollowRedirects(boolean followRedirects) {
-        mDavResource.setFollowRedirects(followRedirects);
+        super.setFollowRedirects(followRedirects);
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                HttpUrl.parse(mUrl.toString()),
+                Constants.INSTANCE.getLog());
     }
 
     @Override
     public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
-        mDavResource.setRetryOnConnectionFailure(retryOnConnectionFailure);
+        super.setRetryOnConnectionFailure(retryOnConnectionFailure);
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                HttpUrl.parse(mUrl.toString()),
+                Constants.INSTANCE.getLog());
     }
 
     //////////////////////////////
@@ -98,20 +114,19 @@ public abstract class DavMethod extends HttpBaseMethod {
 
     @Override
     public boolean getRetryOnConnectionFailure() {
-        return mDavResource.isRetryOnConnectionFailure();
+        return false; //TODO: implement me
     }
 
     @Override
     public boolean isAborted() {
-        return mDavResource.isCallAborted();
+        return true; //TODO: implement me
     }
 
-
-    public DavResource getDavResource() {
-        return mDavResource;
-    }
-
-    public void setUrl(HttpUrl url) {
-        mDavResource = new DavOCResource(mOkHttpClient, url);
+    public void setUrl(URL url) {
+        mUrl = url;
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                HttpUrl.parse(mUrl.toString()),
+                Constants.INSTANCE.getLog());
     }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
index ace87d67..54a51763 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
@@ -3,6 +3,9 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 import java.net.URL;
 
 import at.bitfire.dav4android.exception.UnauthorizedException;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import okhttp3.Response;
 
 public class MkColMethod extends DavMethod {
     public MkColMethod(URL url) {
@@ -12,10 +15,10 @@ public class MkColMethod extends DavMethod {
     @Override
     public int onExecute() throws Exception {
         try {
-            mDavResource.mkCol(null);
-
-            mRequest = mDavResource.getRequest();
-            mResponse = mDavResource.getResponse();
+            mDavResource.mkCol(null, response -> {
+                mResponse = response;
+                return Unit.INSTANCE;
+            });
 
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
index be4cfa34..9004f8a1 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
@@ -5,6 +5,9 @@ import com.owncloud.android.lib.common.http.HttpConstants;
 import java.net.URL;
 
 import at.bitfire.dav4android.exception.UnauthorizedException;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import okhttp3.Response;
 
 public class MoveMethod extends DavMethod {
     final String destinationUrl;
@@ -23,11 +26,10 @@ public class MoveMethod extends DavMethod {
                     destinationUrl,
                     forceOverride,
                     super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER)
-            );
-
-            mRequest = mDavResource.getRequest();
-            mResponse = mDavResource.getResponse();
+                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
+                        mResponse = response;
+                        return Unit.INSTANCE;
+                    });
 
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index 29560612..7962427b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -26,14 +26,13 @@ package com.owncloud.android.lib.common.http.methods.webdav;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Set;
-
-import at.bitfire.dav4android.DavResource;
+import java.util.ArrayList;
+import java.util.List;
 import at.bitfire.dav4android.Property;
+import at.bitfire.dav4android.Response;
 import at.bitfire.dav4android.exception.DavException;
-import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
-import okhttp3.HttpUrl;
+import kotlin.Unit;
 
 /**
  * Propfind calls wrapper
@@ -41,28 +40,48 @@ import okhttp3.HttpUrl;
  */
 public class PropfindMethod extends DavMethod {
 
-    private int mDepth;
-    private Property.Name[] mProperties;
-    private Set<DavResource> mMembers;
+    // request
+    private final int mDepth;
+    private final Property.Name[] mPropertiesToRequest;
 
-    public PropfindMethod(URL url, int depth, Property.Name[] properties) {
+    // response
+    private final List<Response> mMembers;
+    private Response mRoot;
+
+    public PropfindMethod(URL url, int depth, Property.Name[] propertiesToRequest) {
         super(url);
         mDepth = depth;
-        mProperties = properties;
-    };
+        mPropertiesToRequest = propertiesToRequest;
+        mMembers = new ArrayList<>();
+        mRoot = null;
+    }
 
     @Override
-    public int onExecute() throws IOException, HttpException, DavException {
+    public int onExecute() throws IOException, DavException {
         try {
-            mDavResource.propfind(mDepth, mProperties);
-            mMembers = mDavResource.getMembers();
+            mDavResource.propfind(mDepth, mPropertiesToRequest,
+                    (Response response, Response.HrefRelation hrefRelation) -> {
+                        switch (hrefRelation) {
+                            case MEMBER:
+                                mMembers.add(response);
+                                break;
+                            case SELF:
+                                mRoot = response;
+                                break;
+                            case OTHER:
+                            default:
+                        }
+
+                        return Unit.INSTANCE;
+            }, response -> {
+                mResponse = response;
+                return Unit.INSTANCE;
+            });
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
+            return davException.getCode();
         }
 
-        mRequest = mDavResource.getRequest();
-        mResponse = mDavResource.getResponse();
-
         return super.getStatusCode();
     }
 
@@ -70,7 +89,11 @@ public class PropfindMethod extends DavMethod {
         return mDepth;
     }
 
-    public Set<DavResource> getMembers() {
+    public List<Response> getMembers() {
         return mMembers;
     }
+
+    public Response getRoot() {
+        return mRoot;
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index 80a48ed1..9de2f324 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -32,8 +32,11 @@ import java.net.URL;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 import okhttp3.HttpUrl;
 import okhttp3.RequestBody;
+import okhttp3.Response;
 
 /**
  * Put calls wrapper
@@ -51,16 +54,12 @@ public class PutMethod extends DavMethod {
             mDavResource.put(
                     mRequestBody,
                     super.getRequestHeader(HttpConstants.IF_MATCH_HEADER),
-                    // Save a file not known to exist, guaranteeing that another upload didn't happen
-                    // before, losing the data of the previous put
-                    true,
                     super.getRequestHeader(HttpConstants.CONTENT_TYPE_HEADER),
                     super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER)
-            );
-
-            mRequest = mDavResource.getRequest();
-            mResponse = mDavResource.getResponse();
+                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
+                        mResponse = response;
+                        return Unit.INSTANCE;
+                    });
 
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 7fe15d75..7985d658 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -87,10 +87,9 @@ public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
 
             if (status == HttpConstants.HTTP_MULTI_STATUS
                     || status == HttpConstants.HTTP_OK) {
-                // Parse response
-                final DavResource resource = propfind.getDavResource();
 
-                final RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
+                final RemoteFile file = new RemoteFile(propfind.getRoot(),
+                        client.getAccount().getDisplayName());
 
                 result = new RemoteOperationResult<>(OK);
                 result.setData(file);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 0d21d1d0..9265abe5 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -38,6 +38,7 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -88,11 +89,11 @@ public class ReadRemoteFolderOperation extends RemoteOperation<ArrayList<RemoteF
 
                 // parse data from remote folder
                 mFolderAndFiles.add(
-                        new RemoteFile(propfindMethod.getDavResource(), client.getAccount().getDisplayName())
+                        new RemoteFile(propfindMethod.getRoot(), client.getAccount().getDisplayName())
                 );
 
                 // loop to update every child
-                for (DavResource resource : propfindMethod.getMembers()) {
+                for (Response resource : propfindMethod.getMembers()) {
                     RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
                     mFolderAndFiles.add(file);
                 }
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 14ed0e2d..f574c2b3 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -30,9 +30,12 @@ import android.os.Parcelable;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 import at.bitfire.dav4android.DavResource;
+import at.bitfire.dav4android.Property;
 import at.bitfire.dav4android.PropertyCollection;
+import at.bitfire.dav4android.Response;
 import at.bitfire.dav4android.property.CreationDate;
 import at.bitfire.dav4android.property.GetContentLength;
 import at.bitfire.dav4android.property.GetContentType;
@@ -183,36 +186,45 @@ public class RemoteFile implements Parcelable, Serializable {
             throw new IllegalArgumentException("Trying to create a OCFile with a non valid remote path: " + path);
         }
         mRemotePath = path;
+        mCreationTimestamp = 0;
+        mLength = 0;
+        mMimeType = "DIR";
+        mQuotaUsedBytes = BigDecimal.ZERO;
+        mQuotaAvailableBytes = BigDecimal.ZERO;
+        mPrivateLink = null;
     }
 
-    public RemoteFile(final DavResource davResource, String displayName) {
-        this(getRemotePathFromUrl(davResource.getLocation(), displayName));
-        final PropertyCollection properties = davResource.getProperties();
-        this.setCreationTimestamp(properties.get(CreationDate.class) != null
-                ? Long.parseLong(properties.get(CreationDate.class).getCreationDate())
-                : 0);
-        this.setLength(properties.get(GetContentLength.class) != null
-                ? properties.get(GetContentLength.class).getContentLength()
-                : 0);
-        this.setMimeType(properties.get(GetContentType.class) != null
-                ? properties.get(GetContentType.class).getType()
-                : "DIR");
-        this.setModifiedTimestamp(properties.get(GetLastModified.class).getLastModified());
-        this.setEtag(properties.get(GetETag.class).getETag());
-        this.setPermissions(properties.get(OCPermissions.class).getPermission());
-        this.setRemoteId(properties.get(OCId.class).getId());
-        this.setSize(properties.get(OCSize.class).getSize());
-        this.setQuotaUsedBytes(properties.get(QuotaUsedBytes.class) != null
-                ? BigDecimal.valueOf(
-                    properties.get(QuotaUsedBytes.class).getQuotaUsedBytes())
-                : BigDecimal.ZERO);
-        this.setQuotaAvailableBytes(properties.get(QuotaAvailableBytes.class) != null
-                ? BigDecimal.valueOf(
-                        properties.get(QuotaAvailableBytes.class).getQuotaAvailableBytes())
-                : BigDecimal.ZERO);
-        this.setPrivateLink(properties.get(OCPrivatelink.class) != null
-                ? properties.get(OCPrivatelink.class).getLink()
-                : null);
+    public RemoteFile(final Response davResource, String displayName) {
+        this(getRemotePathFromUrl(davResource.getHref(), displayName));
+        final List<Property> properties = davResource.getProperties();
+
+        for(Property property : properties) {
+            if(property instanceof CreationDate)
+                this.setCreationTimestamp(
+                        Long.parseLong(((CreationDate) property).getCreationDate()));
+            if(property instanceof GetContentLength)
+                this.setLength(((GetContentLength) property).getContentLength());
+            if(property instanceof  GetContentType)
+                this.setMimeType(((GetContentType) property).getType());
+            if(property instanceof GetLastModified)
+                this.setModifiedTimestamp(((GetLastModified) property).getLastModified());
+            if(property instanceof GetETag)
+                this.setEtag(((GetETag) property).getETag());
+            if(property instanceof OCPermissions)
+                this.setPermissions(((OCPermissions) property).getPermission());
+            if(property instanceof OCId)
+                this.setRemoteId(((OCId) property).getId());
+            if(property instanceof OCSize)
+                this.setSize(((OCSize) property).getSize());
+            if(property instanceof  QuotaUsedBytes)
+                this.setQuotaUsedBytes(
+                        BigDecimal.valueOf(((QuotaUsedBytes) property).getQuotaUsedBytes()));
+            if(property instanceof QuotaAvailableBytes)
+                this.setQuotaAvailableBytes(
+                        BigDecimal.valueOf(((QuotaAvailableBytes) property).getQuotaAvailableBytes()));
+            if(property instanceof OCPrivatelink)
+                this.setPrivateLink(((OCPrivatelink) property).getLink());
+        }
     }
 
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 27b8330f..2f1b428e 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -37,7 +37,9 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.net.URL;
+import java.util.List;
 
+import at.bitfire.dav4android.Property;
 import at.bitfire.dav4android.PropertyCollection;
 import at.bitfire.dav4android.property.QuotaAvailableBytes;
 import at.bitfire.dav4android.property.QuotaUsedBytes;
@@ -90,13 +92,12 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation<GetRemoteUserQu
             PropfindMethod propfindMethod = new PropfindMethod(
                     new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mRemotePath)),
                     DEPTH_0,
-                    DavUtils.getQuotaPropSet()
-            );
+                    DavUtils.getQuotaPropSet());
 
             int status = client.executeHttpMethod(propfindMethod);
 
             if (isSuccess(status)) {
-                RemoteQuota remoteQuota = readData(propfindMethod.getDavResource().getProperties());
+                RemoteQuota remoteQuota = readData(propfindMethod.getRoot().getProperties());
 
                 result = new RemoteOperationResult<>(OK);
 
@@ -139,10 +140,16 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation<GetRemoteUserQu
      * @param properties WebDAV properties containing quota data
      * @return new {@link RemoteQuota} instance representing the data read from the server
      */
-    private RemoteQuota readData(PropertyCollection properties) {
+    private RemoteQuota readData(List<Property> properties) {
+        long quotaAvailable = 0;
+        long quotaUsed = 0;
 
-        long quotaAvailable = properties.get(QuotaAvailableBytes.class).getQuotaAvailableBytes();
-        long quotaUsed = properties.get(QuotaUsedBytes.class).getQuotaUsedBytes();
+        for(Property property : properties) {
+            if(property instanceof QuotaAvailableBytes)
+                quotaAvailable = ((QuotaAvailableBytes) property).getQuotaAvailableBytes();
+            if(property instanceof QuotaUsedBytes)
+                quotaUsed = ((QuotaUsedBytes) property).getQuotaUsedBytes();
+        }
 
         // If there's a special case, quota available will contain a negative code
         // -1, PENDING: Not computed yet, e.g. external storage mounted but folder sizes need scanning

From e0e6d3da4944172a05d6840e9d1e902fba8eb90d Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 18 Jul 2018 11:49:06 +0200
Subject: [PATCH 100/133] Use callback to get okhttp response

---
 .../owncloud/android/lib/common/OwnCloudClient.java  |  2 --
 .../lib/common/http/methods/webdav/DavMethod.java    |  6 ++----
 .../common/http/methods/webdav/PropfindMethod.java   | 12 ++++++------
 .../files/ExistenceCheckRemoteOperation.java         |  1 -
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index d67fee6e..3aba71d9 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -175,8 +175,6 @@ public class OwnCloudClient extends HttpClient {
         return status;
     }
 
-
-
     public RedirectionPath followRedirection(HttpBaseMethod method) throws Exception {
         int redirectionsCount = 0;
         int status = method.getStatusCode();
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index 1c827b88..bf926d63 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -24,7 +24,6 @@
 
 package com.owncloud.android.lib.common.http.methods.webdav;
 
-import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import java.net.URL;
@@ -32,7 +31,6 @@ import java.util.concurrent.TimeUnit;
 
 import at.bitfire.dav4android.Constants;
 import at.bitfire.dav4android.DavOCResource;
-import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.exception.RedirectException;
 import okhttp3.HttpUrl;
 
@@ -61,8 +59,8 @@ public abstract class DavMethod extends HttpBaseMethod {
     @Override
     public int execute() throws Exception {
         try {
-             return onExecute();
-        } catch(RedirectException e) {
+            return onExecute();
+        } catch (RedirectException e) {
             return getStatusCode();
         }
     }
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index 7962427b..fd4590b0 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+
 import at.bitfire.dav4android.Property;
 import at.bitfire.dav4android.Response;
 import at.bitfire.dav4android.exception.DavException;
@@ -71,18 +72,17 @@ public class PropfindMethod extends DavMethod {
                             case OTHER:
                             default:
                         }
-
                         return Unit.INSTANCE;
-            }, response -> {
-                mResponse = response;
-                return Unit.INSTANCE;
-            });
+                    }, response -> {
+                        mResponse = response;
+                        return Unit.INSTANCE;
+                    });
         } catch (UnauthorizedException davException) {
             // Do nothing, we will use the 401 code to handle the situation
             return davException.getCode();
         }
 
-        return super.getStatusCode();
+        return getStatusCode();
     }
 
     public int getDepth() {
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 8e733995..4c6ad18f 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -77,7 +77,6 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
-
         try {
             client.setFollowRedirects(true);
             PropfindMethod propfindMethod = new PropfindMethod(

From c34c8ead1aea9fdc6eb8d773c7d927391039c267 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Thu, 19 Jul 2018 14:25:58 +0200
Subject: [PATCH 101/133] rebse changes from bitfire

---
 dav4android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dav4android b/dav4android
index da434d76..e6688e17 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit da434d7693db7d4cfd434ee22d0d336f37f4b6f8
+Subproject commit e6688e17bef44ba399ca8f8300091fc5d5f185e7

From 7d0c79876c89a0e36d7237346170ca985378e4b1 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 20 Jul 2018 10:58:53 +0200
Subject: [PATCH 102/133] Implement cancel calls for webdav methods

---
 .../android/lib/common/http/methods/webdav/DavMethod.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index bf926d63..43b94d96 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -50,10 +50,9 @@ public abstract class DavMethod extends HttpBaseMethod {
                 Constants.INSTANCE.getLog());
     }
 
-
     @Override
     public void abort() {
-        //TODO: abort here
+        mDavResource.cancelCall();
     }
 
     @Override
@@ -117,7 +116,7 @@ public abstract class DavMethod extends HttpBaseMethod {
 
     @Override
     public boolean isAborted() {
-        return true; //TODO: implement me
+        return mDavResource.isCallAborted();
     }
 
     public void setUrl(URL url) {

From 096d3b91651d1e50957fa4986374f82f29853309 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 23 Jul 2018 13:19:58 +0200
Subject: [PATCH 103/133] Fix problem with certificate exception catching

---
 .../common/network/AdvancedX509TrustManager.java |  2 +-
 .../common/operations/RemoteOperationResult.java | 16 ++++++++++++++++
 .../status/GetRemoteStatusOperation.java         |  7 +++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
index 8495a370..53d60475 100644
--- a/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
+++ b/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
@@ -100,7 +100,7 @@ public class AdvancedX509TrustManager implements X509TrustManager {
      * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],
      *      String authType)
      */
-    public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException {
+    public void checkServerTrusted(X509Certificate[] certificates, String authType) {
         if (!isKnownServer(certificates[0])) {
         	CertificateCombinedException result = new CertificateCombinedException(certificates[0]);
         	try {
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index efed8ef4..eabcc34c 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -118,6 +118,22 @@ public class RemoteOperationResult<T extends Object>
                 code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION);
     }
 
+    /**
+     * Create a new RemoteOperationResult based on the result given by a previous one.
+     * It does not copy the data.
+     * @param prevRemoteOperation
+     */
+    public RemoteOperationResult(RemoteOperationResult prevRemoteOperation) {
+        mCode = prevRemoteOperation.mCode;
+        mHttpCode = prevRemoteOperation.mHttpCode;
+        mHttpPhrase = prevRemoteOperation.mHttpPhrase;
+        mAuthenticate = prevRemoteOperation.mAuthenticate;
+        mException = prevRemoteOperation.mException;
+        mLastPermanentLocation = prevRemoteOperation.mLastPermanentLocation;
+        mSuccess = prevRemoteOperation.mSuccess;
+        mRedirectedLocation = prevRemoteOperation.mRedirectedLocation;
+    }
+
     /**
      * Public constructor from exception.
      *
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index bd5641f3..8caf2a4a 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -41,6 +42,8 @@ import org.json.JSONObject;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLPeerUnverifiedException;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
@@ -88,8 +91,8 @@ public class GetRemoteStatusOperation extends RemoteOperation<OwnCloudVersion> {
             try {
                 status = client.executeHttpMethod(getMethod);
                 mLatestResult = new RemoteOperationResult(OK);
-            } catch (SSLPeerUnverifiedException certEx) {
-                mLatestResult = new RemoteOperationResult(certEx);
+            } catch (SSLException sslE) {
+                mLatestResult = new RemoteOperationResult(sslE);
                 return false;
             }
 

From c5a1df417fcbc3864fb6a75c019d41ee44984a5e Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Tue, 24 Jul 2018 10:34:38 +0200
Subject: [PATCH 104/133] fixed barear authentication

---
 .../lib/common/authentication/OwnCloudBasicCredentials.java | 5 ++---
 .../common/authentication/OwnCloudBearerCredentials.java    | 6 +++---
 .../common/authentication/OwnCloudCredentialsFactory.java   | 3 +--
 .../common/authentication/OwnCloudSamlSsoCredentials.java   | 3 +--
 src/com/owncloud/android/lib/common/http/HttpConstants.java | 4 ++--
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 19ad1a59..66c0a1db 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -52,11 +52,10 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
     @Override
     public void applyTo(OwnCloudClient client) {
         // Clear previous basic credentials
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
         HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
-        HttpClient.addHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER,
+        HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER,
                 Credentials.basic(mUsername, mPassword));
     }
 
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
index f3d1ec08..a53712d6 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
@@ -40,11 +40,11 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
     @Override
     public void applyTo(OwnCloudClient client) {
         // Clear previous credentials
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
         HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
-        HttpClient.addHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER, mAccessToken);
+        HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER,
+                HttpConstants.BEARER_AUTHORIZATION_KEY + mAccessToken);
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
index 1049d1e5..a7f2ff80 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
@@ -67,8 +67,7 @@ public class OwnCloudCredentialsFactory {
         @Override
         public void applyTo(OwnCloudClient client) {
             // Clear previous basic credentials
-            HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
-            HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+            HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
             HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
         }
 
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
index 3cba25d7..a01e05da 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
@@ -40,8 +40,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
     @Override
     public void applyTo(OwnCloudClient client) {
         // Clear previous credentials
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER);
-        HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
+        HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
         HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
 
         HttpClient.addHeaderForAllRequests(HttpConstants.COOKIE_HEADER, mSessionCookie);
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 86e39df7..80558a54 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -33,9 +33,9 @@ public class HttpConstants {
      *************************************************** HEADERS ***********************************************
      ***********************************************************************************************************/
 
-    public static final String BASIC_AUTHORIZATION_HEADER = "Authorization";
+    public static final String AUTHORIZATION_HEADER = "Authorization";
     public static final String COOKIE_HEADER = "Cookie";
-    public static final String BEARER_AUTHORIZATION_HEADER = "Bearer ";
+    public static final String BEARER_AUTHORIZATION_KEY = "Bearer ";
     public static final String USER_AGENT_HEADER = "User-Agent";
     public static final String IF_MATCH_HEADER = "If-Match";
     public static final String IF_NONE_MATCH_HEADER = "If-None-Match";

From fd6628e38f149157e30ed47ea3977312f37ab840 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Wed, 25 Jul 2018 13:50:27 +0200
Subject: [PATCH 105/133] fix type error

---
 .../android/lib/resources/users/GetRemoteUserInfoOperation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index fba5c4b9..b9b28e16 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -48,7 +48,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David González Verdugo
  */
 
-public class GetRemoteUserInfoOperation extends RemoteOperation {
+public class GetRemoteUserInfoOperation extends RemoteOperation<GetRemoteUserInfoOperation.UserInfo> {
 
     private static final String TAG = GetRemoteUserInfoOperation.class.getSimpleName();
 

From d944c500dd6d5153d1c03d98fd3922c1cfc3ef29 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 26 Jul 2018 10:41:42 +0200
Subject: [PATCH 106/133] Remove some unneeded dependencies

---
 src/com/owncloud/android/lib/resources/files/RemoteFile.java    | 2 --
 .../lib/resources/users/GetRemoteUserQuotaOperation.java        | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index f574c2b3..36ca6baf 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -32,9 +32,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
-import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.Property;
-import at.bitfire.dav4android.PropertyCollection;
 import at.bitfire.dav4android.Response;
 import at.bitfire.dav4android.property.CreationDate;
 import at.bitfire.dav4android.property.GetContentLength;
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 2f1b428e..e48b1eed 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -40,7 +40,6 @@ import java.net.URL;
 import java.util.List;
 
 import at.bitfire.dav4android.Property;
-import at.bitfire.dav4android.PropertyCollection;
 import at.bitfire.dav4android.property.QuotaAvailableBytes;
 import at.bitfire.dav4android.property.QuotaUsedBytes;
 

From 9944f30d3fdf2add00a1d0545e143d08f1b58afb Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 6 Aug 2018 09:52:14 +0200
Subject: [PATCH 107/133] Remove the ignored sample client setup.xml

---
 sample_client/res/values/setup.xml | 31 ------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 sample_client/res/values/setup.xml

diff --git a/sample_client/res/values/setup.xml b/sample_client/res/values/setup.xml
deleted file mode 100644
index 28c2baad..00000000
--- a/sample_client/res/values/setup.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2016 ownCloud GmbH.
-    
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-   
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-   
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
- -->
- 
-<resources>
-    <string name="server_base_url">http://docker.oc.solidgear.es:11917</string>
-    <string name="username">admin</string>
-    <string name="password">Password</string>
-    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud sample </string>
-</resources>

From b0fa6ae1d0eef8ed4aa8bb6840de834cba96c4b0 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 7 Aug 2018 17:24:19 +0200
Subject: [PATCH 108/133] Apply requested changes

---
 build.gradle                                  |   3 -
 sample_client/AndroidManifest.xml             |  30 ++--
 .../android/lib/common/OwnCloudAccount.java   |   5 +-
 .../android/lib/common/OwnCloudClient.java    |  46 ++---
 .../lib/common/OwnCloudClientFactory.java     |  13 +-
 .../lib/common/OwnCloudClientManager.java     |   6 +-
 .../lib/common/SingleSessionManager.java      |   3 +-
 .../lib/common/accounts/AccountUtils.java     |  38 ++--
 .../oauth/BearerCredentials.java              |   9 +-
 .../oauth/OAuth2GetAccessTokenOperation.java  |  10 +-
 .../OAuth2RefreshAccessTokenOperation.java    |  11 +-
 .../android/lib/common/http/HttpClient.java   |   7 +-
 .../lib/common/http/HttpConstants.java        |   1 +
 .../common/http/methods/HttpBaseMethod.java   |   3 +-
 .../ChunkFromFileChannelRequestEntity.java    | 165 ------------------
 .../lib/common/network/FileRequestEntity.java |  93 ----------
 .../common/operations/RemoteOperation.java    |  19 +-
 .../operations/RemoteOperationResult.java     |  24 +++
 .../files/CopyRemoteFileOperation.java        |   7 +-
 .../files/CreateRemoteFolderOperation.java    |   4 +-
 .../files/DownloadRemoteFileOperation.java    |   6 +-
 .../files/ExistenceCheckRemoteOperation.java  |   4 +-
 .../lib/resources/files/FileUtils.java        |   7 +-
 .../files/MoveRemoteFileOperation.java        |   5 +-
 .../files/ReadRemoteFileOperation.java        |   4 +-
 .../files/ReadRemoteFolderOperation.java      |   1 -
 .../lib/resources/files/RemoteFile.java       |   3 +-
 .../files/RenameRemoteFileOperation.java      |   6 +-
 .../files/UploadRemoteFileOperation.java      |   1 -
 .../ChunkedUploadRemoteFileOperation.java     |   1 -
 .../RemoveRemoteChunksFolderOperation.java    |  25 +++
 .../resources/shares/ShareParserResult.java   |  25 +++
 .../ShareToRemoteOperationResultParser.java   |   4 +-
 .../status/GetRemoteStatusOperation.java      |   4 -
 .../users/GetRemoteUserAvatarOperation.java   |   6 +-
 .../users/GetRemoteUserInfoOperation.java     |   8 -
 .../SelfSignedConfidentSslSocketFactory.java  |   8 +-
 .../lib/test_project/TestActivity.java        |   2 +-
 38 files changed, 188 insertions(+), 429 deletions(-)
 delete mode 100644 src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
 delete mode 100644 src/com/owncloud/android/lib/common/network/FileRequestEntity.java

diff --git a/build.gradle b/build.gradle
index e6a9c02d..1d1e60d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,9 +21,6 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:3.10.0'
     api project(':dav4android')
 
-    // Used for network and database debuging
-    debugApi 'com.facebook.stetho:stetho:1.5.0'
-    debugApi 'com.facebook.stetho:stetho-okhttp3:1.5.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51"
 }
 
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index c0885e36..58d5d6c1 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -24,23 +24,27 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.owncloud.android.lib.sampleclient"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-permission android:name="android.permission.INTERNET" />
+          package="com.owncloud.android.lib.sampleclient"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="26"/>
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
-        <activity 	android:name="MainActivity"
-                  	android:label="@string/app_name"
-					android:screenOrientation="portrait"
-   					android:configChanges="orientation|keyboardHidden"
-                  >
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name">
+        <activity
+            android:name="MainActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/OwnCloudAccount.java b/src/com/owncloud/android/lib/common/OwnCloudAccount.java
index 533247df..b3ebcd59 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudAccount.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudAccount.java
@@ -116,9 +116,8 @@ public class OwnCloudAccount {
      * @throws IOException
      * @throws OperationCanceledException
      */
-    public void loadCredentials(Context context)
-        throws AccountNotFoundException, AuthenticatorException,
-                IOException, OperationCanceledException {
+    public void loadCredentials(Context context) throws AuthenticatorException,
+            IOException, OperationCanceledException {
 
         if (context == null) {
             throw new IllegalArgumentException("Parameter 'context' cannot be null");
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 3aba71d9..e05ccc30 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -25,36 +25,36 @@
 
 package com.owncloud.android.lib.common;
 
+import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
-import com.owncloud.android.lib.common.http.methods.webdav.CopyMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
 import at.bitfire.dav4android.exception.HttpException;
-import at.bitfire.dav4android.exception.RedirectException;
 import okhttp3.Cookie;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 
 public class OwnCloudClient extends HttpClient {
 
-    public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
     public static final String NEW_WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/";
     public static final String NEW_WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/uploads/";
     public static final String STATUS_PATH = "/status.php";
@@ -63,8 +63,6 @@ public class OwnCloudClient extends HttpClient {
     private static final String TAG = OwnCloudClient.class.getSimpleName();
     private static final int MAX_REDIRECTIONS_COUNT = 3;
     private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
-    private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
-    private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
 
     private static byte[] sExhaustBuffer = new byte[1024];
@@ -101,15 +99,6 @@ public class OwnCloudClient extends HttpClient {
         mInstanceNumber = sIntanceCounter++;
         Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
 
-        //TODO
-//        getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
-//        getParams().setParameter(
-//            PARAM_SINGLE_COOKIE_HEADER,             // to avoid problems with some web servers
-//            PARAM_SINGLE_COOKIE_HEADER_VALUE
-//        );
-
-//        applyProxySettings();
-
         clearCredentials();
     }
 
@@ -198,7 +187,7 @@ public class OwnCloudClient extends HttpClient {
 
                 // Release the connection to avoid reach the max number of connections per host
                 // due to it will be set a different url
-                exhaustResponse(method.getResponseAsStream());
+                exhaustResponse(method.getResponseBodyAsStream());
 
                 method.setUrl(HttpUrl.parse(location));
                 final String destination = method.getRequestHeader("Destination") != null
@@ -206,7 +195,7 @@ public class OwnCloudClient extends HttpClient {
                         : method.getRequestHeader("destination");
 
                 if (destination != null) {
-                    final int suffixIndex = location.lastIndexOf(WEBDAV_PATH_4_0);
+                    final int suffixIndex = location.lastIndexOf(getNewFilesWebDavUri().toString());
                     final String redirectionBase = location.substring(0, suffixIndex);
                     final String destinationPath = destination.substring(mBaseUri.toString().length());
 
@@ -250,10 +239,6 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-    public Uri getOldFilesWebdavUri() {
-        return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
-    }
-
     public Uri getNewFilesWebDavUri() {
         return mCredentials instanceof OwnCloudAnonymousCredentials
                 ? Uri.parse(mBaseUri + NEW_WEBDAV_FILES_PATH_4_0)
@@ -288,6 +273,15 @@ public class OwnCloudClient extends HttpClient {
         return mCredentials;
     }
 
+    private void logCookie(Cookie cookie) {
+        Log_OC.d(TAG, "Cookie name: " + cookie.name());
+        Log_OC.d(TAG, "       value: " + cookie.value());
+        Log_OC.d(TAG, "       domain: " + cookie.domain());
+        Log_OC.d(TAG, "       path: " + cookie.path());
+        Log_OC.d(TAG, "       expiryDate: " + cookie.expiresAt());
+        Log_OC.d(TAG, "       secure: " + cookie.secure());
+    }
+
     private void logCookiesAtRequest(Headers headers, String when) {
         int counter = 0;
         for (final String cookieHeader : headers.toMultimap().get("cookie")) {
@@ -331,16 +325,6 @@ public class OwnCloudClient extends HttpClient {
                 getAccount().getBaseUri().toString()), cookies);
     }
 
-    private void logCookie(Cookie cookie) {
-        Log_OC.d(TAG, "Cookie name: " + cookie.name());
-        Log_OC.d(TAG, "       value: " + cookie.value());
-        Log_OC.d(TAG, "       domain: " + cookie.domain());
-        Log_OC.d(TAG, "       path: " + cookie.path());
-        Log_OC.d(TAG, "       expiryDate: " + cookie.expiresAt());
-        Log_OC.d(TAG, "       secure: " + cookie.secure());
-    }
-
-
     public void setOwnCloudVersion(OwnCloudVersion version) {
         mVersion = version;
     }
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index a77568f5..94a0c51d 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,9 +24,6 @@
 
 package com.owncloud.android.lib.common;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -40,12 +37,11 @@ import android.os.Bundle;
 import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.lib.common.http.HttpClient;
-import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import java.io.IOException;
+
 public class OwnCloudClientFactory {
     
     final private static String TAG = OwnCloudClientFactory.class.getSimpleName();
@@ -123,9 +119,6 @@ public class OwnCloudClientFactory {
 
 
         } else {
-            //String password = am.getPassword(account);
-            //String password = am.blockingGetAuthToken(account, MainApp.getAuthTokenTypePass(),
-            // false);
             AccountManagerFuture<Bundle> future =  am.getAuthToken(
                 account,
                 AccountTypeUtils.getAuthTokenTypePass(account.type),
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
index e7fe77af..5ef81382 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce
  * 
  * @author David A. Velasco
  * @author masensio
+ * @author Christian Schabesberger
  */
 
 public interface OwnCloudClientManager {
@@ -51,5 +52,4 @@ public interface OwnCloudClientManager {
     void saveAllClients(Context context, String accountType)
 			throws AccountNotFoundException, AuthenticatorException, 
 			IOException, OperationCanceledException;
-    
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index e36f5fe2..f041f465 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -50,6 +50,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
  *
  * @author David A. Velasco
  * @author masensio
+ * @author Christian Schabesberger
  */
 
 public class SingleSessionManager implements OwnCloudClientManager {
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index a1499481..bf3f92ab 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2017 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,10 +25,6 @@
 
 package com.owncloud.android.lib.common.accounts;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
@@ -43,6 +39,10 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import okhttp3.Cookie;
 
 public class AccountUtils {
@@ -59,11 +59,23 @@ public class AccountUtils {
      */
     public static String getWebDavUrlForAccount(Context context, Account account)
         throws AccountNotFoundException {
+        String webDavUrlForAccount = "";
 
-        return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_PATH_4_0;
+        try {
+            OwnCloudCredentials ownCloudCredentials = getCredentialsForAccount(context, account);
+            webDavUrlForAccount = getBaseUrlForAccount(context, account) + OwnCloudClient.NEW_WEBDAV_FILES_PATH_4_0
+                    + ownCloudCredentials.getUsername();
+        } catch (OperationCanceledException e) {
+            e.printStackTrace();
+        } catch (AuthenticatorException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return webDavUrlForAccount;
     }
 
-
     /**
      * Extracts url server from the account
      *
@@ -84,7 +96,6 @@ public class AccountUtils {
         return baseurl;
     }
 
-
     /**
      * Get the username corresponding to an OC account.
      *
@@ -130,7 +141,7 @@ public class AccountUtils {
     public static OwnCloudCredentials getCredentialsForAccount(Context context, Account account)
         throws OperationCanceledException, AuthenticatorException, IOException {
 
-        OwnCloudCredentials credentials = null;
+        OwnCloudCredentials credentials;
         AccountManager am = AccountManager.get(context);
 
         String supportsOAuth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2);
@@ -174,10 +185,8 @@ public class AccountUtils {
         }
 
         return credentials;
-
     }
 
-
     public static String buildAccountNameOld(Uri serverBaseUrl, String username) {
         if (serverBaseUrl.getScheme() == null) {
             serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
@@ -216,7 +225,6 @@ public class AccountUtils {
                 // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
             }
         }
-
     }
 
     /**
@@ -236,7 +244,7 @@ public class AccountUtils {
             // Account Manager
             AccountManager am = AccountManager.get(context.getApplicationContext());
 
-            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getOldFilesWebdavUri();
+            Uri serverUri = (client.getBaseUri() != null) ? client.getBaseUri() : client.getNewFilesWebDavUri();
 
             String cookiesString = am.getUserData(account, Constants.KEY_COOKIES);
             if (cookiesString != null) {
@@ -275,7 +283,6 @@ public class AccountUtils {
         }
     }
 
-
     public static class Constants {
         /**
          * Version should be 3 numbers separated by dot so it can be parsed by
@@ -316,5 +323,4 @@ public class AccountUtils {
         public static final String KEY_OAUTH2_REFRESH_TOKEN = "oc_oauth2_refresh_token";
 
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java b/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java
index f83e6fd5..6d82bdb3 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,10 +24,9 @@
 
 package com.owncloud.android.lib.common.authentication.oauth;
 
-
 /**
- *
  * @author David A. Velasco
+ * @author Christian Schabesberger
  */
 public class BearerCredentials {
 
@@ -96,6 +95,4 @@ public class BearerCredentials {
         }
         return false;
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
index a3cea994..a3e5666f 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
@@ -1,7 +1,8 @@
 /* ownCloud Android Library is available under MIT license
  *
  *   @author David A. Velasco
- *   Copyright (C) 2017 ownCloud GmbH.
+ *   @author Christian Schabesberger
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -105,8 +106,6 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, S
 
             postMethod.setRequestBody(requestBody);
 
-
-            // Do the B***S*** Switch and onExecute
             OwnCloudCredentials oauthCredentials =
                     new OwnCloudBasicCredentials(mClientId, mClientSecret);
             OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
@@ -129,7 +128,7 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, S
 
             } else {
                 result = new RemoteOperationResult<>(ResultCode.OK);
-                client.exhaustResponse(postMethod.getResponseAsStream());
+                client.exhaustResponse(postMethod.getResponseBodyAsStream());
             }
 
         } catch (Exception e) {
@@ -144,5 +143,4 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation<Map<String, S
         getClient().setCredentials(newCredentials);
         return previousCredentials;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
index 5027301e..eba3dbeb 100644
--- a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
+++ b/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
@@ -2,8 +2,9 @@
  *   ownCloud Android client application
  *
  *   @author David González Verdugo
+ *   @author Christian Schabesberger
  *
- *   Copyright (C) 2017 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -77,7 +78,6 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<Strin
     protected RemoteOperationResult<Map<String, String>> run(OwnCloudClient client) {
 
         try {
-
             final RequestBody requestBody = new MultipartBody.Builder()
                     .setType(MultipartBody.FORM)
                     .addFormDataPart(OAuth2Constants.KEY_GRANT_TYPE,
@@ -96,11 +96,8 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<Strin
                             .toString()));
             postMethod.setRequestBody(requestBody);
 
+            final OwnCloudCredentials oauthCredentials = new OwnCloudBasicCredentials(mClientId, mClientSecret);
 
-            final OwnCloudCredentials oauthCredentials =
-                    new OwnCloudBasicCredentials(mClientId, mClientSecret);
-
-            // Do the B***S*** switch
             final OwnCloudCredentials oldCredentials = switchClientCredentials(oauthCredentials);
             client.executeHttpMethod(postMethod);
             switchClientCredentials(oldCredentials);
@@ -120,7 +117,6 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<Strin
                         accessTokenResult.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null)
                         ? new RemoteOperationResult<>(ResultCode.OAUTH2_ERROR)
                         : result;
-
             } else {
                 return new RemoteOperationResult<>(postMethod);
             }
@@ -135,5 +131,4 @@ public class OAuth2RefreshAccessTokenOperation extends RemoteOperation<Map<Strin
         getClient().setCredentials(newCredentials);
         return previousCredentials;
     }
-
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 4aa51922..1fa11633 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -25,11 +25,8 @@
 package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
-
-import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
-import com.facebook.stetho.okhttp3.StethoInterceptor;
 import com.owncloud.android.lib.BuildConfig;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
@@ -77,9 +74,6 @@ public class HttpClient {
                         .hostnameVerifier((asdf, usdf) -> true);
                         // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
                         //.hostnameVerifier(new BrowserCompatHostnameVerifier());
-                if(BuildConfig.DEBUG) {
-                    clientBuilder.addNetworkInterceptor(new StethoInterceptor());
-                }
                 sOkHttpClient = clientBuilder.build();
 
             } catch (Exception e) {
@@ -93,6 +87,7 @@ public class HttpClient {
         if (sOkHttpInterceptor == null) {
             sOkHttpInterceptor = new HttpInterceptor();
             addHeaderForAllRequests(HttpConstants.USER_AGENT_HEADER, OwnCloudClientManagerFactory.getUserAgent());
+            addHeaderForAllRequests(HttpConstants.PARAM_SINGLE_COOKIE_HEADER, "true");
         }
         return sOkHttpInterceptor;
     }
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 80558a54..f1de6ddc 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -42,6 +42,7 @@ public class HttpConstants {
     public static final String CONTENT_TYPE_HEADER = "Content-Type";
     public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
+    public static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
 
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index aaadcebf..39c3d14e 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -74,7 +74,6 @@ public abstract class HttpBaseMethod {
         return mCall.isCanceled();
     }
 
-
     //////////////////////////////
     //         For override
     //////////////////////////////
@@ -98,7 +97,7 @@ public abstract class HttpBaseMethod {
         return mResponse.body().string();
     }
 
-    public InputStream getResponseAsStream() {
+    public InputStream getResponseBodyAsStream() {
         return mResponse.body().byteStream();
     }
 
diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
deleted file mode 100644
index e5017112..00000000
--- a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.network;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-
-
-import com.owncloud.android.lib.common.utils.Log_OC;
-
-
-/**
- * A RequestEntity that represents a PIECE of a file.
- * 
- * @author David A. Velasco
- */
-public class ChunkFromFileChannelRequestEntity implements ProgressiveDataTransferer {
-
-    private static final String TAG = ChunkFromFileChannelRequestEntity.class.getSimpleName();
-    
-    //private final File mFile;
-    private final FileChannel mChannel;
-    private final String mContentType;
-    private final long mChunkSize;
-    private final File mFile;
-    private long mOffset;
-    private long mTransferred;
-    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
-    private ByteBuffer mBuffer = ByteBuffer.allocate(4096);
-
-    public ChunkFromFileChannelRequestEntity(
-        final FileChannel channel, final String contentType, long chunkSize, final File file
-    ) {
-        super();
-        if (channel == null) {
-            throw new IllegalArgumentException("File may not be null");
-        }
-        if (chunkSize <= 0) {
-            throw new IllegalArgumentException("Chunk size must be greater than zero");
-        }
-        mChannel = channel;
-        mContentType = contentType;
-        mChunkSize = chunkSize;
-        mFile = file;
-        mOffset = 0;
-        mTransferred = 0;
-    }
-    
-    public void setOffset(long offset) {
-        mOffset = offset;
-    }
-    
-    public long getContentLength() {
-        try {
-            return Math.min(mChunkSize, mChannel.size() - mChannel.position());
-        } catch (IOException e) {
-            return mChunkSize;
-        }
-    }
-
-    public String getContentType() {
-        return mContentType;
-    }
-
-    public boolean isRepeatable() {
-        return true;
-    }
-    
-    @Override
-    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.add(listener);
-        }
-    }
-    
-    @Override
-    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.addAll(listeners);
-        }
-    }
-    
-    @Override
-    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.remove(listener);
-        }
-    }
-    
-    
-    public void writeRequest(final OutputStream out) throws IOException {
-        int readCount;
-        Iterator<OnDatatransferProgressListener> it;
-
-        try {
-            mChannel.position(mOffset);
-            long size = mFile.length();
-            if (size == 0) size = -1;
-            long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
-            while (mChannel.position() < maxCount) {
-                readCount = mChannel.read(mBuffer);
-                try {
-                    out.write(mBuffer.array(), 0, readCount);
-                } catch (IOException io) {
-                    // work-around try catch to filter exception in writing
-                    throw new FileRequestEntity.WriteException(io);
-                }
-                mBuffer.clear();
-                if (mTransferred < maxCount) {  // condition to avoid accumulate progress for repeated chunks
-                    mTransferred += readCount;
-                }
-                synchronized (mDataTransferListeners) {
-                    it = mDataTransferListeners.iterator();
-                    while (it.hasNext()) {
-                        it.next().onTransferProgress(readCount, mTransferred, size, mFile.getAbsolutePath());
-                    }
-                }
-            }
-
-        } catch (IOException io) {
-            // any read problem will be handled as if the file is not there
-            if (io instanceof FileNotFoundException) {
-                throw io;
-            } else {
-                FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
-                fnf.initCause(io);
-                throw fnf;
-            }
-
-        } catch (FileRequestEntity.WriteException we) {
-            throw we.getWrapped();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
deleted file mode 100644
index 2bc0ee27..00000000
--- a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
- *   Copyright (C) 2012  Bartek Przybylski
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.common.network;
-
-
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-
-
-/**
- * A RequestEntity that represents a File.
- * 
- */
-public class FileRequestEntity implements ProgressiveDataTransferer {
-
-    final File mFile;
-    final String mContentType;
-    Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
-
-    public FileRequestEntity(final File file, final String contentType) {
-        super();
-        this.mFile = file;
-        this.mContentType = contentType;
-        if (file == null) {
-            throw new IllegalArgumentException("File may not be null");
-        }
-    }
-
-    public String getContentType() {
-        return mContentType;
-    }
-
-    @Override
-    public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.add(listener);
-        }
-    }
-    
-    @Override
-    public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.addAll(listeners);
-        }
-    }
-    
-    @Override
-    public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
-        synchronized (mDataTransferListeners) {
-            mDataTransferListeners.remove(listener);
-        }
-    }
-
-    protected static class WriteException extends Exception {
-        IOException mWrapped;
-
-        WriteException(IOException wrapped) {
-            mWrapped = wrapped;
-        }
-
-        public IOException getWrapped() {
-            return mWrapped;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 19c7517a..df6c4f1e 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -81,10 +81,10 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
 
         if (account == null)
             throw new IllegalArgumentException
-                    ("Trying to onExecute a remote operation with a NULL Account");
+                    ("Trying to execute a remote operation with a NULL Account");
         if (context == null)
             throw new IllegalArgumentException
-                    ("Trying to onExecute a remote operation with a NULL Context");
+                    ("Trying to execute a remote operation with a NULL Context");
         // mAccount and mContext in the runnerThread to create below
         mAccount = account;
         mContext = context.getApplicationContext();
@@ -114,7 +114,7 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
                           OnRemoteOperationListener listener, Handler listenerHandler) {
         if (client == null) {
             throw new IllegalArgumentException
-                    ("Trying to onExecute a remote operation with a NULL OwnCloudClient");
+                    ("Trying to execute a remote operation with a NULL OwnCloudClient");
         }
         mClient = client;
         if (client.getAccount() != null) {
@@ -124,7 +124,7 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
 
         if (listener == null) {
             throw new IllegalArgumentException
-                    ("Trying to onExecute a remote operation asynchronously " +
+                    ("Trying to execute a remote operation asynchronously " +
                             "without a listener to notiy the result");
         }
         mListener = listener;
@@ -182,10 +182,10 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
      */
     public RemoteOperationResult<T> execute(Account account, Context context) {
         if (account == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
                     "Account");
         if (context == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
                     "Context");
         mAccount = account;
         mContext = context.getApplicationContext();
@@ -205,7 +205,7 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
      */
     public RemoteOperationResult<T> execute(OwnCloudClient client) {
         if (client == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
                     "OwnCloudClient");
         mClient = client;
         if (client.getAccount() != null) {
@@ -227,7 +227,7 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
      */
     public RemoteOperationResult<T> execute(OkHttpClient client, Context context) {
         if (client == null)
-            throw new IllegalArgumentException("Trying to onExecute a remote operation with a NULL " +
+            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL " +
                     "OwnCloudClient");
         mHttpClient = client;
         mContext = context;
@@ -283,5 +283,4 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
             mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend);
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index eabcc34c..03e5028d 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -1,3 +1,27 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.operations;
 
 import android.accounts.Account;
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index eb875051..f01c0644 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit;
  * Allows renaming the moving file/folder at the same time.
  *
  * @author David A. Velasco
+ * @author Christian Schabesberger
  */
 public class CopyRemoteFileOperation extends RemoteOperation {
 
@@ -116,7 +117,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
             } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
-                client.exhaustResponse(copyMethod.getResponseAsStream());
+                client.exhaustResponse(copyMethod.getResponseBodyAsStream());
 
 
                 /// for other errors that could be explicitly handled, check first:
@@ -124,7 +125,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
 
             } else {
                 result = new RemoteOperationResult<>(copyMethod);
-                client.exhaustResponse(copyMethod.getResponseAsStream());
+                client.exhaustResponse(copyMethod.getResponseBodyAsStream());
             }
 
             Log.i(TAG, "Copy " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 7d4095bc..31a6555d 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -90,7 +90,6 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
                     result = createFolder(client);    // second (and last) try
                 }
             }
-
         } else {
             result = new RemoteOperationResult<>(ResultCode.INVALID_CHARACTER_IN_NAME);
         }
@@ -98,7 +97,6 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
         return result;
     }
 
-
     private RemoteOperationResult createFolder(OwnCloudClient client) {
         RemoteOperationResult result;
         try {
@@ -112,7 +110,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
                     ? new RemoteOperationResult<>(ResultCode.OK)
                     : new RemoteOperationResult<>(mkcol);
             Log_OC.d(TAG, "Create directory " + mRemotePath + ": " + result.getLogMessage());
-            client.exhaustResponse(mkcol.getResponseAsStream());
+            client.exhaustResponse(mkcol.getResponseBodyAsStream());
 
         } catch (Exception e) {
             result = new RemoteOperationResult<>(e);
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 4902b584..46d6ec52 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -110,7 +110,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
             status = client.executeHttpMethod(mGet);
             if (isSuccess(status)) {
                 targetFile.createNewFile();
-                bis = new BufferedInputStream(mGet.getResponseAsStream());
+                bis = new BufferedInputStream(mGet.getResponseBodyAsStream());
                 fos = new FileOutputStream(targetFile);
                 long transferred = 0;
 
@@ -160,12 +160,12 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                     }
 
                 } else {
-                    client.exhaustResponse(mGet.getResponseAsStream());
+                    client.exhaustResponse(mGet.getResponseBodyAsStream());
                     // TODO some kind of error control!
                 }
 
             } else if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
-                client.exhaustResponse(mGet.getResponseAsStream());
+                client.exhaustResponse(mGet.getResponseBodyAsStream());
 
             } // else, body read by RemoteOperationResult constructor
 
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 4c6ad18f..67d7c61e 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * Operation to check the existence or absence of a path in a remote server.
  *
  * @author David A. Velasco
- * @author David GonzálezVerdugo
+ * @author David González Verdugo
  */
 public class ExistenceCheckRemoteOperation extends RemoteOperation {
 
diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/src/com/owncloud/android/lib/resources/files/FileUtils.java
index 71277b44..a07ef14c 100644
--- a/src/com/owncloud/android/lib/resources/files/FileUtils.java
+++ b/src/com/owncloud/android/lib/resources/files/FileUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -24,10 +24,9 @@
 
 package com.owncloud.android.lib.resources.files;
 
-import java.io.File;
-
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+
+import java.io.File;
 
 public class FileUtils {
 
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index df115b78..9673ee95 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -126,7 +126,6 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             move.setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS);
             move.setConnectionTimeout(MOVE_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
 
-            //int status = client.executeMethod(move, MOVE_READ_TIMEOUT, MOVE_CONNECTION_TIMEOUT);
             final int status = client.executeHttpMethod(move);
             /// process response
             if(isSuccess(status)) {
@@ -134,14 +133,14 @@ public class MoveRemoteFileOperation extends RemoteOperation {
             } else if (status == HttpConstants.HTTP_PRECONDITION_FAILED && !mOverwrite) {
 
                 result = new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE);
-                client.exhaustResponse(move.getResponseAsStream());
+                client.exhaustResponse(move.getResponseBodyAsStream());
 
                 /// for other errors that could be explicitly handled, check first:
                 /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
 
             } else {
                 result = new RemoteOperationResult<>(move);
-                client.exhaustResponse(move.getResponseAsStream());
+                client.exhaustResponse(move.getResponseBodyAsStream());
             }
 
             Log.i(TAG, "Move " + mSrcRemotePath + " to " + mTargetRemotePath + ": " +
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 7985d658..9fcf0d65 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -35,8 +35,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
-import at.bitfire.dav4android.DavResource;
-
 import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
@@ -96,7 +94,7 @@ public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
 
             } else {
                 result = new RemoteOperationResult<>(propfind);
-                client.exhaustResponse(propfind.getResponseAsStream());
+                client.exhaustResponse(propfind.getResponseBodyAsStream());
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 9265abe5..dd823218 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -37,7 +37,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.net.URL;
 import java.util.ArrayList;
 
-import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 36ca6baf..d28462ec 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -53,6 +53,7 @@ import static com.owncloud.android.lib.common.OwnCloudClient.NEW_WEBDAV_FILES_PA
  * Contains the data of a Remote File from a WebDavEntry
  *
  * @author masensio
+ * @author Christian Schabesberger
  */
 
 public class RemoteFile implements Parcelable, Serializable {
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index d5ab14e1..ef19413d 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -57,7 +57,6 @@ public class RenameRemoteFileOperation extends RemoteOperation {
     private String mNewName;
     private String mNewRemotePath;
 
-
     /**
      * Constructor
      *
@@ -121,7 +120,7 @@ public class RenameRemoteFileOperation extends RemoteOperation {
             Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
                     result.getLogMessage()
             );
-            client.exhaustResponse(move.getResponseAsStream());
+            client.exhaustResponse(move.getResponseBodyAsStream());
             return result;
         } catch (Exception e) {
             final RemoteOperationResult result = new RemoteOperationResult<>(e);
@@ -143,5 +142,4 @@ public class RenameRemoteFileOperation extends RemoteOperation {
         RemoteOperationResult exists = existenceCheckRemoteOperation.run(client);
         return exists.isSuccess();
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 4027fa04..d0e4b807 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -136,7 +136,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
         }
 
         mPutMethod.addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, String.valueOf(fileToUpload.length()));
-
         mPutMethod.addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, mFileLastModifTimestamp);
 
         mPutMethod.setRequestBody(mFileRequestBody);
diff --git a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index f50025f1..91e6734e 100644
--- a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -43,7 +43,6 @@ import okhttp3.MediaType;
 
 import static com.owncloud.android.lib.common.http.HttpConstants.IF_MATCH_HEADER;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
-import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
 /**
  * Remote operation performing the chunked upload of a remote file to the ownCloud server.
diff --git a/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
index 831cc79c..48602313 100644
--- a/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
@@ -1,3 +1,28 @@
+/* ownCloud Android Library is available under MIT license
+ *   @author David González Verdugo
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.resources.files.chunks;
 
 import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java b/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java
index 75dea43c..7ba076e6 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java
@@ -1,3 +1,28 @@
+/* ownCloud Android Library is available under MIT license
+ *   @author Christian Schabesberger
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.resources.shares;
 
 import java.util.ArrayList;
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java b/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
index 9f9d84b1..2d6388ed 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
@@ -1,6 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author David A. Velasco
  *   @author David González Verdugo
+ *   @author Christian Schabesberger
  *   Copyright (C) 2018 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -138,5 +139,4 @@ public class ShareToRemoteOperationResultParser {
 
         return result;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 8caf2a4a..68728c3e 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -31,7 +31,6 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
-import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -41,10 +40,7 @@ import org.json.JSONObject;
 
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
-
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLPeerUnverifiedException;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index fd4d343f..9cefac22 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -33,7 +33,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -42,7 +41,6 @@ import java.net.URL;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
-
 /**
  * Gets avatar about the user logged in, if available
  * @author David A. Velasco
@@ -113,7 +111,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
                 mimeType = contentType;
 
                 /// download will be performed to a buffer
-                inputStream = getMethod.getResponseAsStream();
+                inputStream = getMethod.getResponseBodyAsStream();
                 bis = new BufferedInputStream(inputStream);
                 bos = new ByteArrayOutputStream(totalToTransfer);
 
@@ -138,7 +136,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
 
             } else {
                 result = new RemoteOperationResult<>(getMethod);
-                client.exhaustResponse(getMethod.getResponseAsStream());
+                client.exhaustResponse(getMethod.getResponseBodyAsStream());
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
index b9b28e16..7e3c61f2 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -35,11 +35,8 @@ import org.json.JSONObject;
 
 import java.net.URL;
 
-import okhttp3.Request;
-
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
 
-
 /**
  * Gets information (id, display name, and e-mail address) about the user logged in.
  *
@@ -71,11 +68,6 @@ public class GetRemoteUserInfoOperation extends RemoteOperation<GetRemoteUserInf
 
         //Get the user
         try {
-            final Request request = new Request.Builder()
-                    .url(client.getBaseUri() + OCS_ROUTE)
-                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
-                    .build();
-
             GetMethod getMethod = new GetMethod(new URL(client.getBaseUri() + OCS_ROUTE));
 
             int status = client.executeHttpMethod(getMethod);
diff --git a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
index 1612873c..d9fc5c44 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,6 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-
 /**
  * SelfSignedConfidentSslSocketFactory allows to create SSL {@link Socket}s 
  * that accepts self-signed server certificates.
@@ -49,6 +48,7 @@ import javax.net.ssl.X509TrustManager;
  * WARNING: this SHOULD NOT be used in productive environments.
  * 
  * @author David A. Velasco
+ * @author Christian Schabesberger
  */
 
 public class SelfSignedConfidentSslSocketFactory implements SecureProtocolSocketFactory {
@@ -182,6 +182,4 @@ public class SelfSignedConfidentSslSocketFactory implements SecureProtocolSocket
 			return null;
 		}
 	}
-	
-
-}
+}
\ No newline at end of file
diff --git a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
index 2a4333ed..3591bc18 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
@@ -391,4 +391,4 @@ public class TestActivity extends Activity {
         Long timeStampLong = file.lastModified()/1000;
         return timeStampLong.toString();
     }
-}
+}
\ No newline at end of file

From 7627f75aa9c032948ab18653205db76369bea941 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 9 Aug 2018 10:54:31 +0200
Subject: [PATCH 109/133] Get mEtag again

---
 .../lib/resources/files/DownloadRemoteFileOperation.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 46d6ec52..8d60b884 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -154,7 +154,8 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                         Log_OC.e(TAG, "Could not read modification time from response downloading " + mRemotePath);
                     }
 
-                    // TODO mEtag = WebdavUtils.getEtagFromResponse(mGet);
+                    mEtag = WebdavUtils.getEtagFromResponse(mGet);
+
                     if (mEtag.length() == 0) {
                         Log_OC.e(TAG, "Could not read eTag from response downloading " + mRemotePath);
                     }

From 50fda001ce8dc18667cf5319561b5d593aa934fa Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 9 Aug 2018 15:32:38 +0200
Subject: [PATCH 110/133] Send unique ID header for all requests

---
 .../android/lib/common/OwnCloudClient.java    | 15 +++--
 .../lib/common/http/HttpConstants.java        |  1 +
 .../android/lib/common/utils/Log_OC.java      |  6 +-
 .../android/lib/common/utils/RandomUtils.java | 63 +++++++++++++++++++
 4 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 src/com/owncloud/android/lib/common/utils/RandomUtils.java

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index e05ccc30..40a6daea 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -25,15 +25,11 @@
 
 package com.owncloud.android.lib.common;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.net.Uri;
 
-import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
@@ -42,6 +38,7 @@ import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.common.utils.RandomUtils;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import java.io.IOException;
@@ -53,6 +50,8 @@ import okhttp3.Cookie;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 
+import static com.owncloud.android.lib.common.http.HttpConstants.OC_X_REQUEST_ID;
+
 public class OwnCloudClient extends HttpClient {
 
     public static final String NEW_WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/";
@@ -125,6 +124,14 @@ public class OwnCloudClient extends HttpClient {
         int status;
 
         do {
+            // Clean previous request id. This is a bit hacky but is the only way to add request headers in WebDAV
+            // methods by using Dav4Android
+            deleteHeaderForAllRequests(OC_X_REQUEST_ID);
+
+            // Header to allow tracing requests in apache and ownCloud logs
+            addHeaderForAllRequests(OC_X_REQUEST_ID,
+                    RandomUtils.generateRandomString(RandomUtils.generateRandomInteger(20, 200)));
+
             status = method.execute();
             checkFirstRedirection(method);
             if(mFollowRedirects && !isIdPRedirection()) {
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index f1de6ddc..5ac09eea 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -43,6 +43,7 @@ public class HttpConstants {
     public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
     public static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
+    public static final String OC_X_REQUEST_ID = "X-Request-ID";
 
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************
diff --git a/src/com/owncloud/android/lib/common/utils/Log_OC.java b/src/com/owncloud/android/lib/common/utils/Log_OC.java
index 23e0bd84..ca30f1d8 100644
--- a/src/com/owncloud/android/lib/common/utils/Log_OC.java
+++ b/src/com/owncloud/android/lib/common/utils/Log_OC.java
@@ -1,5 +1,7 @@
 package com.owncloud.android.lib.common.utils;
 
+import android.util.Log;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -7,10 +9,6 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import android.os.Environment;
-import android.util.Log;
-
-
 public class Log_OC {
     private static final String SIMPLE_DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";
     private static final String LOG_FOLDER_NAME = "log";
diff --git a/src/com/owncloud/android/lib/common/utils/RandomUtils.java b/src/com/owncloud/android/lib/common/utils/RandomUtils.java
new file mode 100644
index 00000000..6c043aae
--- /dev/null
+++ b/src/com/owncloud/android/lib/common/utils/RandomUtils.java
@@ -0,0 +1,63 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.utils;
+
+import java.util.Random;
+
+/**
+ * Class with methods to generate random values
+ *
+ * @author David González Verdugo
+ */
+public class RandomUtils {
+
+    private static final String CANDIDATECHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+            "1234567890-+/_=.:";
+
+    /**
+     * @param length the number of random chars to be generated
+     *
+     * @return String containing random chars
+     */
+    public static String generateRandomString(int length) {
+        StringBuilder sb = new StringBuilder();
+        Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            sb.append(CANDIDATECHARS.charAt(random.nextInt(CANDIDATECHARS.length())));
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * @param min minimum integer to obtain randomly
+     * @param max maximum integer to obtain randomly
+     * @return random integer between min and max
+     */
+    public static int generateRandomInteger(int min, int max) {
+        Random r = new Random();
+        return r.nextInt(max-min) + min;
+    }
+}
\ No newline at end of file

From e3db308825494e2cca9166ddafb94759ce713ab9 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 27 Aug 2018 14:03:30 +0200
Subject: [PATCH 111/133] Fix some problems in authentication

---
 .../lib/common/http/interceptors/HttpInterceptor.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
index 4613fe6b..f49b2686 100644
--- a/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
@@ -26,6 +26,7 @@ package com.owncloud.android.lib.common.http.interceptors;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -92,10 +93,12 @@ public class HttpInterceptor implements Interceptor {
     }
 
     public void deleteRequestHeaderInterceptor(String headerName) {
-        for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
-            if (requestInterceptor instanceof RequestHeaderInterceptor &&
-                    ((RequestHeaderInterceptor) requestInterceptor).getHeaderName().equals(headerName)) {
-                mRequestInterceptors.remove(requestInterceptor);
+        Iterator<RequestInterceptor> requestInterceptorIterator = mRequestInterceptors.iterator();
+        while (requestInterceptorIterator.hasNext()) {
+            RequestInterceptor currentRequestInterceptor = requestInterceptorIterator.next();
+            if (currentRequestInterceptor instanceof RequestHeaderInterceptor &&
+                    ((RequestHeaderInterceptor) currentRequestInterceptor).getHeaderName().equals(headerName)) {
+                requestInterceptorIterator.remove();
             }
         }
     }

From eb7cac064f2747e18eb8f03ef8c62c8a5c5c316b Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 28 Aug 2018 17:41:49 +0200
Subject: [PATCH 112/133] Prepare wrapper to handle response bodies after
 exceptions

---
 .../android/lib/common/OwnCloudClient.java    | 10 ++--
 .../lib/common/http/HttpConstants.java        |  2 +
 .../common/http/methods/HttpBaseMethod.java   | 43 +++++++++------
 .../http/methods/webdav/CopyMethod.java       | 47 +++++++++++-----
 .../common/http/methods/webdav/DavMethod.java | 36 +++++++++++--
 .../http/methods/webdav/MkColMethod.java      | 46 +++++++++++-----
 .../http/methods/webdav/MoveMethod.java       | 54 +++++++++++++------
 .../http/methods/webdav/PropfindMethod.java   | 42 +++++++--------
 .../common/http/methods/webdav/PutMethod.java | 29 ++++------
 .../operations/RemoteOperationResult.java     |  2 +-
 .../files/ExistenceCheckRemoteOperation.java  |  4 +-
 11 files changed, 202 insertions(+), 113 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 40a6daea..be4c808d 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -148,7 +148,7 @@ public class OwnCloudClient extends HttpClient {
     }
 
     private void checkFirstRedirection(HttpBaseMethod method) {
-        final String location = method.getResponseHeader("location");
+        final String location = method.getResponseHeader(HttpConstants.LOCATION_HEADER_LOWER);
         if(location != null && !location.isEmpty()) {
             mRedirectedLocation = location;
         }
@@ -182,9 +182,9 @@ public class OwnCloudClient extends HttpClient {
                         status == HttpConstants.HTTP_TEMPORARY_REDIRECT)
                 ) {
 
-            final String location = method.getResponseHeader("Location") != null
-                    ? method.getResponseHeader("Location")
-                    : method.getResponseHeader("location");
+            final String location = method.getResponseHeader(HttpConstants.LOCATION_HEADER) != null
+                    ? method.getResponseHeader(HttpConstants.LOCATION_HEADER)
+                    : method.getResponseHeader(HttpConstants.LOCATION_HEADER_LOWER);
             if (location != null) {
 
                 Log_OC.d(TAG + " #" + mInstanceNumber,
@@ -458,7 +458,7 @@ public class OwnCloudClient extends HttpClient {
                         mRedirectedLocation.toLowerCase().contains("wayf")));
     }
 
-    public boolean isFollowRedirects() {
+    public boolean followRedirects() {
         return mFollowRedirects;
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 5ac09eea..3f3cbc3f 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -44,6 +44,8 @@ public class HttpConstants {
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
     public static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     public static final String OC_X_REQUEST_ID = "X-Request-ID";
+    public static final String LOCATION_HEADER = "Location";
+    public static final String LOCATION_HEADER_LOWER = "location";
 
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 39c3d14e..08ee472b 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -41,8 +41,8 @@ import okhttp3.Response;
 
 /**
  * Wrapper to perform http calls transparently by using:
- *  - OkHttp for non webdav methods
- *  - Dav4Android for webdav methods
+ * - OkHttp for non webdav methods
+ * - Dav4Android for webdav methods
  *
  * @author David González Verdugo
  */
@@ -54,7 +54,7 @@ public abstract class HttpBaseMethod {
     protected Call mCall;
     protected URL mUrl;
 
-    protected HttpBaseMethod (URL url) {
+    protected HttpBaseMethod(URL url) {
         mOkHttpClient = HttpClient.getOkHttpClient();
         mUrl = url;
         mRequest = new Request.Builder()
@@ -84,7 +84,22 @@ public abstract class HttpBaseMethod {
     //         Getter
     //////////////////////////////
 
+    // Request
+
+    public Headers getRequestHeaders() {
+        return mRequest.headers();
+    }
+
+    public String getRequestHeader(String name) {
+        return mRequest.header(name);
+    }
+
+    public HttpUrl getUrl() {
+        return mRequest.url();
+    }
+
     // Response
+
     public int getStatusCode() {
         return mResponse.code();
     }
@@ -109,28 +124,16 @@ public abstract class HttpBaseMethod {
         return mResponse.header(headerName);
     }
 
-    public HttpUrl getUrl() {
-        return mRequest.url();
-    }
-
     public boolean getRetryOnConnectionFailure() {
         return mOkHttpClient.retryOnConnectionFailure();
     }
 
-    // Request
-    public String getRequestHeader(String name) {
-        return mRequest.header(name);
-    }
-
-    public Headers getRequestHeaders() {
-        return mRequest.headers();
-    }
-
     //////////////////////////////
     //         Setter
     //////////////////////////////
 
     // Connection parameters
+
     public void setReadTimeout(long readTimeout, TimeUnit timeUnit) {
         mOkHttpClient = mOkHttpClient.newBuilder()
                 .readTimeout(readTimeout, timeUnit)
@@ -155,12 +158,20 @@ public abstract class HttpBaseMethod {
                 .build();
     }
 
+    // Request
+
     public void addRequestHeader(String name, String value) {
         mRequest = mRequest.newBuilder()
                 .addHeader(name, value)
                 .build();
     }
 
+    /**
+     * Sets a header and replace it if already exists with that name
+     *
+     * @param name  header name
+     * @param value header value
+     */
     public void setRequestHeader(String name, String value) {
         mRequest = mRequest.newBuilder()
                 .header(name, value)
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
index ea79deaf..6350ff82 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java
@@ -1,13 +1,38 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.methods.webdav;
 
 import java.net.URL;
 
-import at.bitfire.dav4android.exception.UnauthorizedException;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import okhttp3.HttpUrl;
-import okhttp3.Response;
 
+/**
+ * Copy calls wrapper
+ * @author Christian Schabesberger
+ * @author David González Verdugo
+ */
 public class CopyMethod extends DavMethod {
 
     final String destinationUrl;
@@ -21,15 +46,11 @@ public class CopyMethod extends DavMethod {
 
     @Override
     public int onExecute() throws Exception {
-        try {
-            mDavResource.copy(destinationUrl, forceOverride, response -> {
-                mResponse = response;
-                return Unit.INSTANCE;
-            });
+        mDavResource.copy(destinationUrl, forceOverride, response -> {
+            mResponse = response;
+            return Unit.INSTANCE;
+        });
 
-        } catch (UnauthorizedException davException) {
-            // Do nothing, we will use the 401 code to handle the situation
-        }
         return super.getStatusCode();
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index 43b94d96..d9797bf6 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -24,6 +24,7 @@
 
 package com.owncloud.android.lib.common.http.methods.webdav;
 
+import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
 
 import java.net.URL;
@@ -31,8 +32,12 @@ import java.util.concurrent.TimeUnit;
 
 import at.bitfire.dav4android.Constants;
 import at.bitfire.dav4android.DavOCResource;
+import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.RedirectException;
 import okhttp3.HttpUrl;
+import okhttp3.Protocol;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 /**
  * Wrapper to perform WebDAV (dav4android) calls
@@ -59,13 +64,36 @@ public abstract class DavMethod extends HttpBaseMethod {
     public int execute() throws Exception {
         try {
             return onExecute();
-        } catch (RedirectException e) {
-            return getStatusCode();
+        } catch (HttpException httpException) {
+            // Modify responses with information gathered from exceptions
+            if (httpException instanceof RedirectException) {
+                mResponse = new Response.Builder()
+                        .header(
+                                HttpConstants.LOCATION_HEADER, ((RedirectException) httpException).getRedirectLocation()
+                        )
+                        .code(httpException.getCode())
+                        .request(mRequest)
+                        .message(httpException.getMessage())
+                        .protocol(Protocol.HTTP_1_1)
+                        .build();
+
+            } else if (mResponse != null) {
+                ResponseBody responseBody = ResponseBody.create(
+                        mResponse.body().contentType(),
+                        httpException.getResponseBody()
+                );
+
+                mResponse = mResponse.newBuilder()
+                        .body(responseBody)
+                        .build();
+            }
+
+            return httpException.getCode();
         }
     }
 
     //////////////////////////////
-    //         setter
+    //         Setter
     //////////////////////////////
 
     // Connection parameters
@@ -106,7 +134,7 @@ public abstract class DavMethod extends HttpBaseMethod {
     }
 
     //////////////////////////////
-    //         getter
+    //         Getter
     //////////////////////////////
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
index 54a51763..4bafc0aa 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java
@@ -1,12 +1,38 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.methods.webdav;
 
 import java.net.URL;
 
-import at.bitfire.dav4android.exception.UnauthorizedException;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import okhttp3.Response;
 
+/**
+ * MkCol calls wrapper
+ * @author Christian Schabesberger
+ * @author David González Verdugo
+ */
 public class MkColMethod extends DavMethod {
     public MkColMethod(URL url) {
         super(url);
@@ -14,15 +40,11 @@ public class MkColMethod extends DavMethod {
 
     @Override
     public int onExecute() throws Exception {
-        try {
-            mDavResource.mkCol(null, response -> {
-                mResponse = response;
-                return Unit.INSTANCE;
-            });
+        mDavResource.mkCol(null, response -> {
+            mResponse = response;
+            return Unit.INSTANCE;
+        });
 
-        } catch (UnauthorizedException davException) {
-            // Do nothing, we will use the 401 code to handle the situation
-        }
         return super.getStatusCode();
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
index 9004f8a1..27a2c918 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java
@@ -1,14 +1,40 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.methods.webdav;
 
 import com.owncloud.android.lib.common.http.HttpConstants;
 
 import java.net.URL;
 
-import at.bitfire.dav4android.exception.UnauthorizedException;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import okhttp3.Response;
 
+/**
+ * Move calls wrapper
+ * @author Christian Schabesberger
+ * @author David González Verdugo
+ */
 public class MoveMethod extends DavMethod {
     final String destinationUrl;
     final boolean forceOverride;
@@ -21,19 +47,15 @@ public class MoveMethod extends DavMethod {
 
     @Override
     public int onExecute() throws Exception {
-        try {
-            mDavResource.move(
-                    destinationUrl,
-                    forceOverride,
-                    super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
-                        mResponse = response;
-                        return Unit.INSTANCE;
-                    });
+        mDavResource.move(
+                destinationUrl,
+                forceOverride,
+                super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
+                super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
+                    mResponse = response;
+                    return Unit.INSTANCE;
+                });
 
-        } catch (UnauthorizedException davException) {
-            // Do nothing, we will use the 401 code to handle the situation
-        }
         return super.getStatusCode();
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
index fd4590b0..31ce12c4 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java
@@ -32,7 +32,6 @@ import java.util.List;
 import at.bitfire.dav4android.Property;
 import at.bitfire.dav4android.Response;
 import at.bitfire.dav4android.exception.DavException;
-import at.bitfire.dav4android.exception.UnauthorizedException;
 import kotlin.Unit;
 
 /**
@@ -58,29 +57,24 @@ public class PropfindMethod extends DavMethod {
     }
 
     @Override
-    public int onExecute() throws IOException, DavException {
-        try {
-            mDavResource.propfind(mDepth, mPropertiesToRequest,
-                    (Response response, Response.HrefRelation hrefRelation) -> {
-                        switch (hrefRelation) {
-                            case MEMBER:
-                                mMembers.add(response);
-                                break;
-                            case SELF:
-                                mRoot = response;
-                                break;
-                            case OTHER:
-                            default:
-                        }
-                        return Unit.INSTANCE;
-                    }, response -> {
-                        mResponse = response;
-                        return Unit.INSTANCE;
-                    });
-        } catch (UnauthorizedException davException) {
-            // Do nothing, we will use the 401 code to handle the situation
-            return davException.getCode();
-        }
+    public int onExecute() throws IOException, DavException{
+        mDavResource.propfind(mDepth, mPropertiesToRequest,
+                (Response response, Response.HrefRelation hrefRelation) -> {
+                    switch (hrefRelation) {
+                        case MEMBER:
+                            mMembers.add(response);
+                            break;
+                        case SELF:
+                            mRoot = response;
+                            break;
+                        case OTHER:
+                        default:
+                    }
+                    return Unit.INSTANCE;
+                }, response -> {
+                    mResponse = response;
+                    return Unit.INSTANCE;
+                });
 
         return getStatusCode();
     }
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
index 9de2f324..f5b889df 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java
@@ -29,14 +29,8 @@ import com.owncloud.android.lib.common.http.HttpConstants;
 import java.io.IOException;
 import java.net.URL;
 
-import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
-import at.bitfire.dav4android.exception.UnauthorizedException;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import okhttp3.HttpUrl;
-import okhttp3.RequestBody;
-import okhttp3.Response;
 
 /**
  * Put calls wrapper
@@ -50,20 +44,15 @@ public class PutMethod extends DavMethod {
 
     @Override
     public int onExecute() throws IOException, HttpException {
-        try {
-            mDavResource.put(
-                    mRequestBody,
-                    super.getRequestHeader(HttpConstants.IF_MATCH_HEADER),
-                    super.getRequestHeader(HttpConstants.CONTENT_TYPE_HEADER),
-                    super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
-                    super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
-                        mResponse = response;
-                        return Unit.INSTANCE;
-                    });
-
-        } catch (UnauthorizedException davException) {
-            // Do nothing, we will use the 401 code to handle the situation
-        }
+        mDavResource.put(
+                mRequestBody,
+                super.getRequestHeader(HttpConstants.IF_MATCH_HEADER),
+                super.getRequestHeader(HttpConstants.CONTENT_TYPE_HEADER),
+                super.getRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER),
+                super.getRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER), response -> {
+                    mResponse = response;
+                    return Unit.INSTANCE;
+                });
 
         return super.getStatusCode();
     }
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 03e5028d..6c233512 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -577,4 +577,4 @@ public class RemoteOperationResult<T extends Object>
     public T getData() {
         return mData;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 67d7c61e..b62eb47b 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -82,8 +82,8 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
             PropfindMethod propfindMethod = new PropfindMethod(
                     new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0,
-                    DavUtils.getAllPropset());
-
+                    DavUtils.getAllPropset()
+            );
             propfindMethod.setReadTimeout(TIMEOUT, TimeUnit.SECONDS);
             propfindMethod.setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS);
 

From d30a5578f3c9eaf248d6ec5674b7a670247334d5 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 29 Aug 2018 09:14:24 +0200
Subject: [PATCH 113/133] Fix antivirus message

---
 .../android/lib/common/operations/RemoteOperationResult.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 6c233512..dbb5eb74 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -235,7 +235,7 @@ public class RemoteOperationResult<T extends Object>
                 httpMethod.getResponseHeaders()
         );
 
-        if (mHttpCode == HttpConstants.HTTP_FORBIDDEN) {   // 400
+        if (mHttpCode == HttpConstants.HTTP_BAD_REQUEST) {   // 400
             String bodyResponse = httpMethod.getResponseBodyAsString();
 
             // do not get for other HTTP codes!; could not be available

From 782361267d6a8a5f3306044b64caae0293f26fc0 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 29 Aug 2018 12:03:58 +0200
Subject: [PATCH 114/133] Fix file downloaded each time is tapped

---
 .../lib/resources/files/DownloadRemoteFileOperation.java       | 3 +++
 .../android/lib/resources/files/ReadRemoteFileOperation.java   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 8d60b884..585c444d 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -156,6 +156,9 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
 
                     mEtag = WebdavUtils.getEtagFromResponse(mGet);
 
+                    // Get rid of extra quotas
+                    mEtag = mEtag.replace("\"", "");
+
                     if (mEtag.length() == 0) {
                         Log_OC.e(TAG, "Could not read eTag from response downloading " + mRemotePath);
                     }
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 9fcf0d65..b351e763 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -86,8 +86,7 @@ public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
             if (status == HttpConstants.HTTP_MULTI_STATUS
                     || status == HttpConstants.HTTP_OK) {
 
-                final RemoteFile file = new RemoteFile(propfind.getRoot(),
-                        client.getAccount().getDisplayName());
+                final RemoteFile file = new RemoteFile(propfind.getRoot(), client.getAccount().getDisplayName());
 
                 result = new RemoteOperationResult<>(OK);
                 result.setData(file);

From f3eb0c44312ec18020cc5b7a9edf663668949751 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 30 Aug 2018 11:04:12 +0200
Subject: [PATCH 115/133] Fix credentials in switch accounts

---
 src/com/owncloud/android/lib/common/OwnCloudClient.java       | 4 ++++
 .../android/lib/common/operations/RemoteOperation.java        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index be4c808d..2d4c79ba 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -117,6 +117,10 @@ public class OwnCloudClient extends HttpClient {
         mCredentials.applyTo(this);
     }
 
+    public void applyCredentials() {
+        mCredentials.applyTo(this);
+    }
+
     public int executeHttpMethod (HttpBaseMethod method) throws Exception {
 
         boolean repeatWithFreshCredentials;
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index df6c4f1e..2dc5487e 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -145,7 +145,7 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
                 OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
                 mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                         getClientFor(ocAccount, mContext);
-
+                mClient.applyCredentials();
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");

From 8a04392bfc39ae107f800ec9addfa8834c4ea5d4 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 30 Aug 2018 13:31:53 +0200
Subject: [PATCH 116/133] Fix follow redirections

---
 .../android/lib/common/OwnCloudClient.java    | 10 +++----
 .../common/http/methods/HttpBaseMethod.java   | 16 +++++------
 .../common/http/methods/webdav/DavMethod.java | 27 ++++++++++---------
 .../files/ExistenceCheckRemoteOperation.java  | 13 +++++++--
 .../status/GetRemoteStatusOperation.java      |  8 +++---
 5 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 2d4c79ba..79d5f4d7 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -178,7 +178,7 @@ public class OwnCloudClient extends HttpClient {
     public RedirectionPath followRedirection(HttpBaseMethod method) throws Exception {
         int redirectionsCount = 0;
         int status = method.getStatusCode();
-        RedirectionPath result = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
+        RedirectionPath redirectionPath = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
 
         while (redirectionsCount < MAX_REDIRECTIONS_COUNT &&
                 (status == HttpConstants.HTTP_MOVED_PERMANENTLY ||
@@ -189,12 +189,12 @@ public class OwnCloudClient extends HttpClient {
             final String location = method.getResponseHeader(HttpConstants.LOCATION_HEADER) != null
                     ? method.getResponseHeader(HttpConstants.LOCATION_HEADER)
                     : method.getResponseHeader(HttpConstants.LOCATION_HEADER_LOWER);
-            if (location != null) {
 
+            if (location != null) {
                 Log_OC.d(TAG + " #" + mInstanceNumber,
                         "Location to redirect: " + location);
 
-                result.addLocation(location);
+                redirectionPath.addLocation(location);
 
                 // Release the connection to avoid reach the max number of connections per host
                 // due to it will be set a different url
@@ -221,7 +221,7 @@ public class OwnCloudClient extends HttpClient {
                         throw e;
                     }
                 }
-                result.addStatus(status);
+                redirectionPath.addStatus(status);
                 redirectionsCount++;
 
             } else {
@@ -229,7 +229,7 @@ public class OwnCloudClient extends HttpClient {
                 status = HttpConstants.HTTP_NOT_FOUND;
             }
         }
-        return result;
+        return redirectionPath;
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index 08ee472b..cbb44a64 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -52,11 +52,9 @@ public abstract class HttpBaseMethod {
     protected RequestBody mRequestBody;
     protected Response mResponse;
     protected Call mCall;
-    protected URL mUrl;
 
     protected HttpBaseMethod(URL url) {
         mOkHttpClient = HttpClient.getOkHttpClient();
-        mUrl = url;
         mRequest = new Request.Builder()
                 .url(HttpUrl.parse(url.toString()))
                 .build();
@@ -94,10 +92,6 @@ public abstract class HttpBaseMethod {
         return mRequest.header(name);
     }
 
-    public HttpUrl getUrl() {
-        return mRequest.url();
-    }
-
     // Response
 
     public int getStatusCode() {
@@ -109,11 +103,17 @@ public abstract class HttpBaseMethod {
     }
 
     public String getResponseBodyAsString() throws IOException {
-        return mResponse.body().string();
+        if (mResponse.body() != null) {
+            return mResponse.body().string();
+        }
+        return null;
     }
 
     public InputStream getResponseBodyAsStream() {
-        return mResponse.body().byteStream();
+        if (mResponse.body() != null) {
+            return mResponse.body().byteStream();
+        }
+        return null;
     }
 
     public Headers getResponseHeaders() {
diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
index d9797bf6..d37c2337 100644
--- a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java
@@ -51,7 +51,7 @@ public abstract class DavMethod extends HttpBaseMethod {
         super(url);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                HttpUrl.parse(mUrl.toString()),
+                HttpUrl.parse(url.toString()),
                 Constants.INSTANCE.getLog());
     }
 
@@ -102,7 +102,7 @@ public abstract class DavMethod extends HttpBaseMethod {
         super.setReadTimeout(readTimeout, timeUnit);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                HttpUrl.parse(mUrl.toString()),
+                HttpUrl.parse(mRequest.url().toString()),
                 Constants.INSTANCE.getLog());
     }
 
@@ -111,7 +111,7 @@ public abstract class DavMethod extends HttpBaseMethod {
         super.setConnectionTimeout(connectionTimeout, timeUnit);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                HttpUrl.parse(mUrl.toString()),
+                HttpUrl.parse(mRequest.url().toString()),
                 Constants.INSTANCE.getLog());
     }
 
@@ -120,7 +120,7 @@ public abstract class DavMethod extends HttpBaseMethod {
         super.setFollowRedirects(followRedirects);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                HttpUrl.parse(mUrl.toString()),
+                HttpUrl.parse(mRequest.url().toString()),
                 Constants.INSTANCE.getLog());
     }
 
@@ -129,7 +129,16 @@ public abstract class DavMethod extends HttpBaseMethod {
         super.setRetryOnConnectionFailure(retryOnConnectionFailure);
         mDavResource = new DavOCResource(
                 mOkHttpClient,
-                HttpUrl.parse(mUrl.toString()),
+                HttpUrl.parse(mRequest.url().toString()),
+                Constants.INSTANCE.getLog());
+    }
+
+    @Override
+    public void setUrl(HttpUrl url){
+        super.setUrl(url);
+        mDavResource = new DavOCResource(
+                mOkHttpClient,
+                HttpUrl.parse(mRequest.url().toString()),
                 Constants.INSTANCE.getLog());
     }
 
@@ -146,12 +155,4 @@ public abstract class DavMethod extends HttpBaseMethod {
     public boolean isAborted() {
         return mDavResource.isCallAborted();
     }
-
-    public void setUrl(URL url) {
-        mUrl = url;
-        mDavResource = new DavOCResource(
-                mOkHttpClient,
-                HttpUrl.parse(mUrl.toString()),
-                Constants.INSTANCE.getLog());
-    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index b62eb47b..3de48b46 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -77,8 +77,9 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
+        boolean previousFollowRedirects = client.followRedirects();
+
         try {
-            client.setFollowRedirects(true);
             PropfindMethod propfindMethod = new PropfindMethod(
                     new URL(client.getNewFilesWebDavUri() + WebdavUtils.encodePath(mPath)),
                     0,
@@ -87,7 +88,13 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
             propfindMethod.setReadTimeout(TIMEOUT, TimeUnit.SECONDS);
             propfindMethod.setConnectionTimeout(TIMEOUT, TimeUnit.SECONDS);
 
-            final int status = client.executeHttpMethod(propfindMethod);
+            client.setFollowRedirects(false);
+            int status = client.executeHttpMethod(propfindMethod);
+
+            if (previousFollowRedirects) {
+                mRedirectionPath = client.followRedirection(propfindMethod);
+                status = mRedirectionPath.getLastStatus();
+            }
 
             /**
              *  PROPFIND method
@@ -111,6 +118,8 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
                     (mSuccessIfAbsent ? " absence " : " existence ") + ": " +
                     result.getLogMessage(), result.getException());
             return result;
+        } finally {
+            client.setFollowRedirects(previousFollowRedirects);
         }
     }
 
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 68728c3e..9896eb44 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -83,17 +83,19 @@ public class GetRemoteStatusOperation extends RemoteOperation<OwnCloudVersion> {
             getMethod.setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
             getMethod.setConnectionTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS);
 
+            client.setFollowRedirects(false);
+            boolean isRedirectToNonSecureConnection = false;
             int status;
             try {
                 status = client.executeHttpMethod(getMethod);
-                mLatestResult = new RemoteOperationResult(OK);
+                mLatestResult = isSuccess(status)
+                        ? new RemoteOperationResult<>(OK)
+                        : new RemoteOperationResult<>(getMethod);
             } catch (SSLException sslE) {
                 mLatestResult = new RemoteOperationResult(sslE);
                 return false;
             }
 
-            client.setFollowRedirects(false);
-            boolean isRedirectToNonSecureConnection = false;
             String redirectedLocation = mLatestResult.getRedirectedLocation();
             while (redirectedLocation != null && redirectedLocation.length() > 0
                 && !mLatestResult.isSuccess()) {

From eaa645ab3c6e20b1dbe38decfba30c550626ebda Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 3 Sep 2018 10:34:49 +0200
Subject: [PATCH 117/133] Fix upload colissions

---
 .../files/chunks/ChunkedUploadRemoteFileOperation.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
index 91e6734e..ac1df185 100644
--- a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
@@ -56,9 +56,9 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
     public static final long CHUNK_SIZE = 1024000;
     private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();
 
-    private long mTransferId;
+    private String mTransferId;
 
-    public ChunkedUploadRemoteFileOperation(long transferId, String localPath, String remotePath, String mimeType,
+    public ChunkedUploadRemoteFileOperation(String transferId, String localPath, String remotePath, String mimeType,
                                             String requiredEtag, String fileLastModifTimestamp) {
         super(localPath, remotePath, mimeType, requiredEtag, fileLastModifTimestamp);
         mTransferId = transferId;

From 800c075bd168b504b3a4f4f28b3e4ee39d576c9a Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 4 Sep 2018 16:44:58 +0200
Subject: [PATCH 118/133] Fix renewal of OAuth2 token

---
 .../android/lib/common/OwnCloudClient.java     | 18 +++---------------
 .../lib/common/OwnCloudClientFactory.java      |  3 ++-
 .../android/lib/common/http/HttpClient.java    |  4 ++++
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 79d5f4d7..fa129688 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -27,7 +27,6 @@ package com.owncloud.android.lib.common;
 
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
-import android.content.Context;
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
@@ -65,18 +64,11 @@ public class OwnCloudClient extends HttpClient {
     private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
 
     private static byte[] sExhaustBuffer = new byte[1024];
-
     private static int sIntanceCounter = 0;
     private OwnCloudCredentials mCredentials = null;
     private int mInstanceNumber = 0;
-
     private Uri mBaseUri;
-
     private OwnCloudVersion mVersion = null;
-
-    /// next too attributes are a very ugly dependency, added to grant silent retry of OAuth token when needed ;
-    /// see #shouldInvalidateCredentials and #invalidateCredentials for more details
-    private Context mContext;
     private OwnCloudAccount mAccount;
 
     /**
@@ -344,10 +336,6 @@ public class OwnCloudClient extends HttpClient {
         return mVersion;
     }
 
-    public Context getContext() {
-        return mContext;
-    }
-
     public void setAccount(OwnCloudAccount account) {
         this.mAccount = account;
     }
@@ -378,7 +366,7 @@ public class OwnCloudClient extends HttpClient {
                         repeatCounter < MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS) {
 
                     try {
-                        mAccount.loadCredentials(mContext);
+                        mAccount.loadCredentials(getContext());
                         // if mAccount.getCredentials().length() == 0 --> refresh failed
                         setCredentials(mAccount.getCredentials());
                         credentialsWereRefreshed = true;
@@ -421,7 +409,7 @@ public class OwnCloudClient extends HttpClient {
                 !(mCredentials instanceof OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials));
 
         // test if have all the needed to effectively invalidate ...
-        should &= (mAccount != null && mAccount.getSavedAccount() != null && mContext != null);
+        should &= (mAccount != null && mAccount.getSavedAccount() != null && getContext() != null);
 
         return should;
     }
@@ -435,7 +423,7 @@ public class OwnCloudClient extends HttpClient {
      * @return                  'True' if invalidation was successful, 'false' otherwise.
      */
     private boolean invalidateAccountCredentials() {
-        AccountManager am = AccountManager.get(mContext);
+        AccountManager am = AccountManager.get(getContext());
         am.invalidateAuthToken(
                 mAccount.getSavedAccount().type,
                 mCredentials.getAuthToken()
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 94a0c51d..0cbb56bb 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -154,7 +154,8 @@ public class OwnCloudClientFactory {
      * @param context   Android context where the OwnCloudClient is being created.
      * @return          A OwnCloudClient object ready to be used
      */
-    public static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
+    public static OwnCloudClient createOwnCloudClient(Uri uri, Context context,
+                                                      boolean followRedirects) {
         OwnCloudClient client = new OwnCloudClient(uri);
 
         client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 1fa11633..e03906bb 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -59,6 +59,10 @@ public class HttpClient {
         sContext = context;
     }
 
+    public Context getContext() {
+        return sContext;
+    }
+
     public static OkHttpClient getOkHttpClient() {
         if (sOkHttpClient == null) {
             try {

From cc612f8712e8a17187800a806367b14a92092894 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 4 Sep 2018 17:24:05 +0200
Subject: [PATCH 119/133] Use header constants instead of plain text

---
 .../owncloud/android/lib/common/OwnCloudClientFactory.java | 1 -
 .../owncloud/android/lib/common/http/HttpConstants.java    | 2 ++
 .../lib/resources/files/DownloadRemoteFileOperation.java   | 2 +-
 .../lib/resources/shares/CreateRemoteShareOperation.java   | 2 +-
 .../lib/resources/shares/UpdateRemoteShareOperation.java   | 4 ++--
 .../lib/resources/users/GetRemoteUserAvatarOperation.java  | 7 ++-----
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 0cbb56bb..933703e6 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -52,7 +52,6 @@ public class OwnCloudClientFactory {
     /** Default timeout for establishing a connection */
     public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 
-
     /**
      * Creates a OwnCloudClient setup for an ownCloud account
      *
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 3f3cbc3f..b7e07dce 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -40,12 +40,14 @@ public class HttpConstants {
     public static final String IF_MATCH_HEADER = "If-Match";
     public static final String IF_NONE_MATCH_HEADER = "If-None-Match";
     public static final String CONTENT_TYPE_HEADER = "Content-Type";
+    public static final String CONTENT_LENGTH_HEADER = "Content-Length";
     public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
     public static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     public static final String OC_X_REQUEST_ID = "X-Request-ID";
     public static final String LOCATION_HEADER = "Location";
     public static final String LOCATION_HEADER_LOWER = "location";
+    public static final String CONTENT_TYPE_URLENCODED_UTF8 = "application/x-www-form-urlencoded; charset=utf-8";
 
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 585c444d..54e637cd 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -114,7 +114,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                 fos = new FileOutputStream(targetFile);
                 long transferred = 0;
 
-                String contentLength = mGet.getResponseHeader("Content-Length");
+                String contentLength = mGet.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER);
                 long totalToTransfer =
                         (contentLength != null
                                 && contentLength.length() > 0)
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index e6d2dbad..feb3992e 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -230,7 +230,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
             postMethod.setRequestBody(formBodyBuilder.build());
 
-            postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            postMethod.setRequestHeader(HttpConstants.CONTENT_TYPE_HEADER, HttpConstants.CONTENT_TYPE_URLENCODED_UTF8);
             postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(postMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 6f93259b..2ec8c3ed 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -200,14 +200,14 @@ public class UpdateRemoteShareOperation extends RemoteOperation<ShareParserResul
 
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
+            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
             PutMethod putMethod = new PutMethod(new URL(uriBuilder.build().toString()));
 
             putMethod.setRequestBody(formBodyBuilder.build());
 
-            putMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            putMethod.setRequestHeader(HttpConstants.CONTENT_TYPE_HEADER, HttpConstants.CONTENT_TYPE_URLENCODED_UTF8);
             putMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(putMethod);
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 9cefac22..eb88d11f 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -46,13 +46,11 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David A. Velasco
  * @author David González Verdugo
  */
-
 public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserAvatarOperation.ResultData> {
 
     private static final String TAG = GetRemoteUserAvatarOperation.class.getSimpleName();
 
     private static final String NON_OFFICIAL_AVATAR_PATH = "/index.php/avatar/";
-    private static final String IF_NONE_MATCH_HEADER = "If-None-Match";
 
     /** Desired size in pixels of the squared image */
     private int mDimension;
@@ -63,7 +61,6 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
      */
     private String mCurrentEtag;
 
-
     public GetRemoteUserAvatarOperation(int dimension, String currentEtag) {
         mDimension = dimension;
         mCurrentEtag = currentEtag;
@@ -90,7 +87,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
             if (isSuccess(status)) {
                 // find out size of file to read
                 int totalToTransfer = 0;
-                String contentLength = getMethod.getResponseHeader("Content-Length");
+                String contentLength = getMethod.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER);
 
                 if (contentLength != null && contentLength.length() > 0) {
                     totalToTransfer = Integer.parseInt(contentLength);
@@ -98,7 +95,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
 
                 // find out MIME-type!
                 String mimeType;
-                String contentType = getMethod.getResponseHeader("Content-Type");
+                String contentType = getMethod.getResponseHeader(HttpConstants.CONTENT_TYPE_HEADER);
 
                 if (contentType == null || !contentType.startsWith("image")) {
                     Log_OC.e(

From 81f1804917014283de61dbe78429d5e481667530 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 5 Sep 2018 13:44:43 +0200
Subject: [PATCH 120/133] Fix remote file creation using username instead of
 display name

---
 .../android/lib/resources/files/ReadRemoteFileOperation.java  | 2 +-
 .../lib/resources/files/ReadRemoteFolderOperation.java        | 4 ++--
 src/com/owncloud/android/lib/resources/files/RemoteFile.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index b351e763..0680ba26 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -86,7 +86,7 @@ public class ReadRemoteFileOperation extends RemoteOperation<RemoteFile> {
             if (status == HttpConstants.HTTP_MULTI_STATUS
                     || status == HttpConstants.HTTP_OK) {
 
-                final RemoteFile file = new RemoteFile(propfind.getRoot(), client.getAccount().getDisplayName());
+                final RemoteFile file = new RemoteFile(propfind.getRoot(), client.getCredentials().getUsername());
 
                 result = new RemoteOperationResult<>(OK);
                 result.setData(file);
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index dd823218..f80e68cb 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -88,12 +88,12 @@ public class ReadRemoteFolderOperation extends RemoteOperation<ArrayList<RemoteF
 
                 // parse data from remote folder
                 mFolderAndFiles.add(
-                        new RemoteFile(propfindMethod.getRoot(), client.getAccount().getDisplayName())
+                        new RemoteFile(propfindMethod.getRoot(), client.getCredentials().getUsername())
                 );
 
                 // loop to update every child
                 for (Response resource : propfindMethod.getMembers()) {
-                    RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
+                    RemoteFile file = new RemoteFile(resource, client.getCredentials().getUsername());
                     mFolderAndFiles.add(file);
                 }
 
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index d28462ec..a453e4a4 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -193,8 +193,8 @@ public class RemoteFile implements Parcelable, Serializable {
         mPrivateLink = null;
     }
 
-    public RemoteFile(final Response davResource, String displayName) {
-        this(getRemotePathFromUrl(davResource.getHref(), displayName));
+    public RemoteFile(final Response davResource, String userName) {
+        this(getRemotePathFromUrl(davResource.getHref(), userName));
         final List<Property> properties = davResource.getProperties();
 
         for(Property property : properties) {

From 817e3c894b09c9993e6c418ab51fff0c6282a87f Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 12 Sep 2018 09:40:36 +0200
Subject: [PATCH 121/133] Crash when restoring cookies

---
 .../owncloud/android/lib/common/accounts/AccountUtils.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index bf3f92ab..fe7d0242 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -37,6 +37,7 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import java.io.IOException;
@@ -256,7 +257,11 @@ public class AccountUtils {
                             .name(rawCookie.substring(0, equalPos))
                             .value(rawCookie.substring(equalPos + 1))
                             .domain(serverUri.getHost())
-                            .path(serverUri.getPath())
+                            .path(
+                                    serverUri.getPath().equals("")
+                                            ? FileUtils.PATH_SEPARATOR
+                                            : serverUri.getPath()
+                            )
                             .build());
                 }
                 client.setCookiesForCurrentAccount(cookieList);

From fef62aaf7465963faec2a0b4acd0762d17892f83 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 25 Sep 2018 15:37:03 +0200
Subject: [PATCH 122/133] Include dav4android via jitpack

---
 .gitmodules     | 3 ---
 build.gradle    | 4 ++--
 settings.gradle | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index c0c4fac3..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "dav4android"]
-	path = dav4android
-	url = https://gitlab.com/ownclouders/dav4android.git
diff --git a/build.gradle b/build.gradle
index 1d1e60d2..85c66a30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,14 +14,14 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
 
 dependencies {
     api 'com.squareup.okhttp3:okhttp:3.10.0'
-    api project(':dav4android')
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51"
+    implementation 'com.gitlab.ownclouders:dav4android:oc_support'
 }
 
 android {
diff --git a/settings.gradle b/settings.gradle
index 44a27a15..3f42d192 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,3 @@
 include ':'
 include ':sample_client'
-include ':test_client'
-include ':dav4android'
\ No newline at end of file
+include ':test_client'
\ No newline at end of file

From ae7be42ec3568f2f9cc9fd48223a62762c5a75a1 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 25 Sep 2018 15:52:16 +0200
Subject: [PATCH 123/133] Remove dav4android subproject

---
 dav4android | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 dav4android

diff --git a/dav4android b/dav4android
deleted file mode 160000
index e6688e17..00000000
--- a/dav4android
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e6688e17bef44ba399ca8f8300091fc5d5f185e7

From f2ccc62b886d4b2ee6aff983724922ae0b7b1008 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 28 Sep 2018 12:30:06 +0200
Subject: [PATCH 124/133] Reimplement cookies handling

---
 .../android/lib/common/OwnCloudClient.java    | 20 ++++++-----
 .../lib/common/OwnCloudClientManager.java     |  5 ++-
 .../lib/common/SingleSessionManager.java      |  6 ++--
 .../lib/common/accounts/AccountUtils.java     |  5 +--
 .../OwnCloudBasicCredentials.java             |  3 --
 .../android/lib/common/http/HttpClient.java   | 36 +++++++++++++++++--
 .../RequestHeaderInterceptor.java             | 27 ++++++++++++++
 .../common/operations/RemoteOperation.java    |  1 +
 8 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index fa129688..afc035c3 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -29,6 +29,7 @@ import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.net.Uri;
 
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
@@ -91,6 +92,7 @@ public class OwnCloudClient extends HttpClient {
         Log_OC.d(TAG + " #" + mInstanceNumber, "Creating OwnCloudClient");
 
         clearCredentials();
+        clearCookies();
     }
 
     public void setCredentials(OwnCloudCredentials credentials) {
@@ -113,6 +115,10 @@ public class OwnCloudClient extends HttpClient {
         mCredentials.applyTo(this);
     }
 
+    public void applyCookies() {
+        AccountUtils.restoreCookies(this.getAccount().getSavedAccount(), this, getContext());
+    }
+
     public int executeHttpMethod (HttpBaseMethod method) throws Exception {
 
         boolean repeatWithFreshCredentials;
@@ -308,15 +314,9 @@ public class OwnCloudClient extends HttpClient {
         }
     }
 
-    public List<Cookie> getCookiesFromCurrentAccount() {
-        return getOkHttpClient().cookieJar().loadForRequest(HttpUrl.parse(
-                getAccount().getBaseUri().toString()));
-    }
-
     public String getCookiesString() {
-
         String cookiesString = "";
-        for (Cookie cookie : getCookiesFromCurrentAccount()) {
+        for (Cookie cookie : getCookiesFromUrl(HttpUrl.parse(mBaseUri.toString()))) {
             cookiesString += cookie.toString() + ";";
         }
 
@@ -324,8 +324,10 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public void setCookiesForCurrentAccount(List<Cookie> cookies) {
-        getOkHttpClient().cookieJar().saveFromResponse(HttpUrl.parse(
-                getAccount().getBaseUri().toString()), cookies);
+        getOkHttpClient().cookieJar().saveFromResponse(
+                HttpUrl.parse(getAccount().getBaseUri().toString()),
+                cookies
+        );
     }
 
     public void setOwnCloudVersion(OwnCloudVersion version) {
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
index 5ef81382..fbaebc06 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
@@ -32,7 +32,6 @@ import android.content.Context;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 
-
 /**
  * Manager to create and reuse OwnCloudClient instances to access remote OC servers. 
  * 
@@ -43,8 +42,8 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce
 
 public interface OwnCloudClientManager {
 
-	OwnCloudClient getClientFor(OwnCloudAccount account, Context context)
-            throws AccountNotFoundException, OperationCanceledException, AuthenticatorException,
+	OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws AccountNotFoundException,
+			OperationCanceledException, AuthenticatorException,
             IOException;
     
     OwnCloudClient removeClientFor(OwnCloudAccount account);
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index f041f465..478490fd 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -65,9 +65,8 @@ public class SingleSessionManager implements OwnCloudClientManager {
 
 
     @Override
-    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context)
-        throws AccountNotFoundException, OperationCanceledException, AuthenticatorException,
-        IOException {
+    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws OperationCanceledException,
+            AuthenticatorException, IOException {
 
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log_OC.d(TAG, "getClientFor starting ");
@@ -221,7 +220,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
             reusedClient.getCredentials().getAuthToken())) {
             reusedClient.setCredentials(recentCredentials);
         }
-
     }
 
     // this method is just a patch; we need to distinguish accounts in the same host but
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index fe7d0242..0b0f7ab9 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -215,7 +215,6 @@ public class AccountUtils {
     }
 
     public static void saveClient(OwnCloudClient client, Account savedAccount, Context context) {
-
         // Account Manager
         AccountManager ac = AccountManager.get(context.getApplicationContext());
 
@@ -223,7 +222,7 @@ public class AccountUtils {
             String cookiesString = client.getCookiesString();
             if (!"".equals(cookiesString)) {
                 ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString);
-                // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
+                 Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
             }
         }
     }
@@ -252,7 +251,9 @@ public class AccountUtils {
                 String[] rawCookies = cookiesString.split(";");
                 List<Cookie> cookieList = new ArrayList<>(rawCookies.length);
                 for(String rawCookie : rawCookies) {
+                    rawCookie = rawCookie.replace(" ", "");
                     final int equalPos = rawCookie.indexOf('=');
+                    if (equalPos == -1) continue;
                     cookieList.add(new Cookie.Builder()
                             .name(rawCookie.substring(0, equalPos))
                             .value(rawCookie.substring(equalPos + 1))
diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
index 66c0a1db..ecd2a0c4 100644
--- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
@@ -35,18 +35,15 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
     private String mUsername;
     private String mPassword;
-    private boolean mAuthenticationPreemptive;
 
     public OwnCloudBasicCredentials(String username, String password) {
         mUsername = username != null ? username : "";
         mPassword = password != null ? password : "";
-        mAuthenticationPreemptive = true;
     }
 
     public OwnCloudBasicCredentials(String username, String password, boolean preemptiveMode) {
         mUsername = username != null ? username : "";
         mPassword = password != null ? password : "";
-        mAuthenticationPreemptive = preemptiveMode;
     }
 
     @Override
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index e03906bb..a29a95af 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -25,9 +25,7 @@
 package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
-import java.util.concurrent.TimeUnit;
 
-import com.owncloud.android.lib.BuildConfig;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
 import com.owncloud.android.lib.common.http.interceptors.RequestHeaderInterceptor;
@@ -35,12 +33,19 @@ import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import okhttp3.Cookie;
+import okhttp3.CookieJar;
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 
@@ -54,6 +59,7 @@ public class HttpClient {
     private static OkHttpClient sOkHttpClient;
     private static HttpInterceptor sOkHttpInterceptor;
     private static Context sContext;
+    private static HashMap<String, List<Cookie>> sCookieStore = new HashMap<>();
 
     public static void setContext(Context context) {
         sContext = context;
@@ -70,12 +76,28 @@ public class HttpClient {
                         NetworkUtils.getKnownServersStore(sContext));
                 final SSLContext sslContext = SSLContext.getInstance("TLS");
                 sslContext.init(null, new TrustManager[] {trustManager}, null);
+
+                // Automatic cookie handling, NOT PERSISTENT
+                CookieJar cookieJar = new CookieJar() {
+                    @Override
+                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                        sCookieStore.put(url.host(), cookies);
+                    }
+
+                    @Override
+                    public List<Cookie> loadForRequest(HttpUrl url) {
+                        List<Cookie> cookies = sCookieStore.get(url.host());
+                        return cookies != null ? cookies : new ArrayList<>();
+                    }
+                };
+
                 OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
                         .addInterceptor(getOkHttpInterceptor())
                         .protocols(Arrays.asList(Protocol.HTTP_1_1))
                         .followRedirects(false)
                         .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
-                        .hostnameVerifier((asdf, usdf) -> true);
+                        .hostnameVerifier((asdf, usdf) -> true)
+                        .cookieJar(cookieJar);
                         // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
                         //.hostnameVerifier(new BrowserCompatHostnameVerifier());
                 sOkHttpClient = clientBuilder.build();
@@ -128,4 +150,12 @@ public class HttpClient {
     public static void deleteHeaderForAllRequests(String headerName) {
         getOkHttpInterceptor().deleteRequestHeaderInterceptor(headerName);
     }
+
+    public List<Cookie> getCookiesFromUrl(HttpUrl httpUrl) {
+        return sCookieStore.get(httpUrl.host());
+    }
+
+    public void clearCookies() {
+        sCookieStore.clear();
+    }
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java
index a7b31c26..a998e49b 100644
--- a/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java
+++ b/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java
@@ -1,7 +1,34 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
 package com.owncloud.android.lib.common.http.interceptors;
 
 import okhttp3.Request;
 
+/**
+ * Intercept requests to update their headers
+ */
 public class RequestHeaderInterceptor implements HttpInterceptor.RequestInterceptor {
 
     private String mHeaderName;
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 2dc5487e..0a1b67c7 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -146,6 +146,7 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
                 mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                         getClientFor(ocAccount, mContext);
                 mClient.applyCredentials();
+                mClient.applyCookies();
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");

From 549cc32703e1c0f51a25412cbae410b475cd5b01 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 28 Sep 2018 13:42:01 +0200
Subject: [PATCH 125/133] Make cookies handling more efficient

---
 .../android/lib/common/OwnCloudClient.java     |  8 ++++++--
 .../lib/common/SingleSessionManager.java       | 18 ++++++++++++++++--
 .../lib/common/operations/RemoteOperation.java |  1 -
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index afc035c3..a6ed730b 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -316,8 +316,12 @@ public class OwnCloudClient extends HttpClient {
 
     public String getCookiesString() {
         String cookiesString = "";
-        for (Cookie cookie : getCookiesFromUrl(HttpUrl.parse(mBaseUri.toString()))) {
-            cookiesString += cookie.toString() + ";";
+        List<Cookie> cookieList = getCookiesFromUrl(HttpUrl.parse(mBaseUri.toString()));
+
+        if (cookieList != null) {
+            for (Cookie cookie : cookieList) {
+                cookiesString += cookie.toString() + ";";
+            }
         }
 
         return cookiesString;
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 478490fd..7e3096c1 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -26,12 +26,14 @@ package com.owncloud.android.lib.common;
 
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 
 
 import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
@@ -43,6 +45,8 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import okhttp3.Cookie;
+
 /**
  * Implementation of {@link OwnCloudClientManager}
  *
@@ -108,6 +112,8 @@ public class SingleSessionManager implements OwnCloudClientManager {
             reusingKnown = true;
         }
 
+        account.loadCredentials(context);
+
         if (client == null) {
             // no client to reuse - create a new one
             client = OwnCloudClientFactory.createOwnCloudClient(
@@ -121,7 +127,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
             // enable cookie tracking
             AccountUtils.restoreCookies(account.getSavedAccount(), client, context);
 
-            account.loadCredentials(context);
             client.setCredentials(account.getCredentials());
             if (accountName != null) {
                 mClientsWithKnownUsername.put(accountName, client);
@@ -140,6 +145,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
                 Log_OC.v(TAG, "reusing client for session " + sessionName);
             }
             keepCredentialsUpdated(account, client);
+            keepCookiesUpdated(context, account, client);
             keepUriUpdated(account, client);
         }
 
@@ -213,7 +219,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
         }
     }
 
-
     private void keepCredentialsUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) {
         OwnCloudCredentials recentCredentials = account.getCredentials();
         if (recentCredentials != null && !recentCredentials.getAuthToken().equals(
@@ -222,6 +227,15 @@ public class SingleSessionManager implements OwnCloudClientManager {
         }
     }
 
+    private void keepCookiesUpdated(Context context, OwnCloudAccount account, OwnCloudClient reusedClient) {
+        AccountManager am = AccountManager.get(context.getApplicationContext());
+        String currentCookies = am.getUserData(account.getSavedAccount(), AccountUtils.Constants.KEY_COOKIES);
+        String previousCookies = reusedClient.getCookiesString();
+        if (currentCookies != null && previousCookies != "" && !currentCookies.equals(previousCookies)) {
+            AccountUtils.restoreCookies(account.getSavedAccount(), reusedClient, context);
+        }
+    }
+
     // this method is just a patch; we need to distinguish accounts in the same host but
     // different paths; but that requires updating the accountNames for apps upgrading
     private void keepUriUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) {
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 0a1b67c7..2dc5487e 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -146,7 +146,6 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
                 mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                         getClientFor(ocAccount, mContext);
                 mClient.applyCredentials();
-                mClient.applyCookies();
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");

From 5d3bba65e262ee0a8625816cb2255be9f298637c Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 1 Oct 2018 10:16:12 +0200
Subject: [PATCH 126/133] Fix SAML with new cookies handling

---
 .../android/lib/common/OwnCloudClient.java    |  4 ----
 .../lib/common/SingleSessionManager.java      | 23 ++++++++++++-------
 .../android/lib/common/http/HttpClient.java   | 16 +++++++++++++
 .../common/http/methods/HttpBaseMethod.java   |  8 ++++---
 .../common/operations/RemoteOperation.java    |  1 -
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index a6ed730b..3dd193af 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -115,10 +115,6 @@ public class OwnCloudClient extends HttpClient {
         mCredentials.applyTo(this);
     }
 
-    public void applyCookies() {
-        AccountUtils.restoreCookies(this.getAccount().getSavedAccount(), this, getContext());
-    }
-
     public int executeHttpMethod (HttpBaseMethod method) throws Exception {
 
         boolean repeatWithFreshCredentials;
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 7e3096c1..b786c55d 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -43,6 +43,7 @@ import android.util.Log;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+import com.owncloud.android.lib.common.authentication.OwnCloudSamlSsoCredentials;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import okhttp3.Cookie;
@@ -55,6 +56,7 @@ import okhttp3.Cookie;
  * @author David A. Velasco
  * @author masensio
  * @author Christian Schabesberger
+ * @author David González Verdugo
  */
 
 public class SingleSessionManager implements OwnCloudClientManager {
@@ -124,10 +126,12 @@ public class SingleSessionManager implements OwnCloudClientManager {
             client.setContext(context);
             client.setOwnCloudClientManager(this);
 
-            // enable cookie tracking
-            AccountUtils.restoreCookies(account.getSavedAccount(), client, context);
-
             client.setCredentials(account.getCredentials());
+
+            if (client.getCredentials() instanceof OwnCloudSamlSsoCredentials) {
+                client.disableAutomaticCookiesHandling();
+            }
+
             if (accountName != null) {
                 mClientsWithKnownUsername.put(accountName, client);
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
@@ -144,6 +148,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
             if (!reusingKnown && Log.isLoggable(TAG, Log.VERBOSE)) {
                 Log_OC.v(TAG, "reusing client for session " + sessionName);
             }
+
             keepCredentialsUpdated(account, client);
             keepCookiesUpdated(context, account, client);
             keepUriUpdated(account, client);
@@ -189,7 +194,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
             Log_OC.d(TAG, "removeClientFor finishing ");
         }
         return null;
-
     }
 
 
@@ -224,15 +228,18 @@ public class SingleSessionManager implements OwnCloudClientManager {
         if (recentCredentials != null && !recentCredentials.getAuthToken().equals(
             reusedClient.getCredentials().getAuthToken())) {
             reusedClient.setCredentials(recentCredentials);
+            reusedClient.applyCredentials();
         }
     }
 
     private void keepCookiesUpdated(Context context, OwnCloudAccount account, OwnCloudClient reusedClient) {
         AccountManager am = AccountManager.get(context.getApplicationContext());
-        String currentCookies = am.getUserData(account.getSavedAccount(), AccountUtils.Constants.KEY_COOKIES);
-        String previousCookies = reusedClient.getCookiesString();
-        if (currentCookies != null && previousCookies != "" && !currentCookies.equals(previousCookies)) {
-            AccountUtils.restoreCookies(account.getSavedAccount(), reusedClient, context);
+        if (am != null && account.getSavedAccount() != null) {
+            String recentCookies = am.getUserData(account.getSavedAccount(), AccountUtils.Constants.KEY_COOKIES);
+            String previousCookies = reusedClient.getCookiesString();
+            if (recentCookies != null && previousCookies != "" && !recentCookies.equals(previousCookies)) {
+                AccountUtils.restoreCookies(account.getSavedAccount(), reusedClient, context);
+            }
         }
     }
 
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index a29a95af..4820fc1d 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -135,6 +135,22 @@ public class HttpClient {
         sOkHttpClient = clientBuilder.build();
     }
 
+    public void disableAutomaticCookiesHandling() {
+        OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
+        clientBuilder.cookieJar(new CookieJar() {
+            @Override
+            public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                // DO NOTHING
+            }
+
+            @Override
+            public List<Cookie> loadForRequest(HttpUrl url) {
+                return new ArrayList<>();
+            }
+        });
+        sOkHttpClient = clientBuilder.build();
+    }
+
     /**
      * Add header that will be included for all the requests from now on
      * @param headerName
diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
index cbb44a64..4444b964 100644
--- a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
+++ b/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java
@@ -51,6 +51,7 @@ public abstract class HttpBaseMethod {
     protected Request mRequest;
     protected RequestBody mRequestBody;
     protected Response mResponse;
+    protected String mResponseBodyString;
     protected Call mCall;
 
     protected HttpBaseMethod(URL url) {
@@ -103,10 +104,11 @@ public abstract class HttpBaseMethod {
     }
 
     public String getResponseBodyAsString() throws IOException {
-        if (mResponse.body() != null) {
-            return mResponse.body().string();
+        if (mResponseBodyString == null && mResponse.body() != null) {
+            mResponseBodyString = mResponse.body().string();
         }
-        return null;
+
+        return mResponseBodyString;
     }
 
     public InputStream getResponseBodyAsStream() {
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 2dc5487e..9c769aee 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -145,7 +145,6 @@ public abstract class RemoteOperation<T extends Object> implements Runnable {
                 OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
                 mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                         getClientFor(ocAccount, mContext);
-                mClient.applyCredentials();
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");

From d195b2ff8994c39fa66640cb40655325aaf6cecc Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 1 Oct 2018 11:54:19 +0200
Subject: [PATCH 127/133] Include fix to switch credentials properly

---
 .../owncloud/android/lib/common/SingleSessionManager.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index b786c55d..2ebc8dc2 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -224,12 +224,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
     }
 
     private void keepCredentialsUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) {
-        OwnCloudCredentials recentCredentials = account.getCredentials();
-        if (recentCredentials != null && !recentCredentials.getAuthToken().equals(
-            reusedClient.getCredentials().getAuthToken())) {
-            reusedClient.setCredentials(recentCredentials);
-            reusedClient.applyCredentials();
-        }
+        reusedClient.applyCredentials();
     }
 
     private void keepCookiesUpdated(Context context, OwnCloudAccount account, OwnCloudClient reusedClient) {

From c36a71caf2d77afb61fdf9ae3752de28d6447db8 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 1 Oct 2018 13:07:33 +0200
Subject: [PATCH 128/133] Avoid duplicated cookies

---
 .../owncloud/android/lib/common/http/HttpClient.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 4820fc1d..6a66cc28 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -36,7 +36,9 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
@@ -81,7 +83,13 @@ public class HttpClient {
                 CookieJar cookieJar = new CookieJar() {
                     @Override
                     public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
-                        sCookieStore.put(url.host(), cookies);
+                        // Avoid duplicated cookies
+                        Set<Cookie> nonDuplicatedCookiesSet = new HashSet<>();
+                        nonDuplicatedCookiesSet.addAll(cookies);
+                        List<Cookie> nonDuplicatedCookiesList = new ArrayList<>();
+                        nonDuplicatedCookiesList.addAll(nonDuplicatedCookiesSet);
+
+                        sCookieStore.put(url.host(), nonDuplicatedCookiesList);
                     }
 
                     @Override

From 096d037f94718ae59ac08f18afaa9c7e51adefb8 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 1 Oct 2018 13:21:55 +0200
Subject: [PATCH 129/133] Clean up some dependencies

---
 .../lib/common/SingleSessionManager.java      | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 2ebc8dc2..99642813 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -24,14 +24,6 @@
 
 package com.owncloud.android.lib.common;
 
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
@@ -41,12 +33,13 @@ import android.net.Uri;
 import android.util.Log;
 
 import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudSamlSsoCredentials;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import okhttp3.Cookie;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  * Implementation of {@link OwnCloudClientManager}
@@ -114,8 +107,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
             reusingKnown = true;
         }
 
-        account.loadCredentials(context);
-
         if (client == null) {
             // no client to reuse - create a new one
             client = OwnCloudClientFactory.createOwnCloudClient(
@@ -126,6 +117,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
             client.setContext(context);
             client.setOwnCloudClientManager(this);
 
+            account.loadCredentials(context);
             client.setCredentials(account.getCredentials());
 
             if (client.getCredentials() instanceof OwnCloudSamlSsoCredentials) {
@@ -149,7 +141,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
                 Log_OC.v(TAG, "reusing client for session " + sessionName);
             }
 
-            keepCredentialsUpdated(account, client);
+            keepCredentialsUpdated(client);
             keepCookiesUpdated(context, account, client);
             keepUriUpdated(account, client);
         }
@@ -163,7 +155,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
 
     @Override
     public OwnCloudClient removeClientFor(OwnCloudAccount account) {
-
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log_OC.d(TAG, "removeClientFor starting ");
         }
@@ -198,9 +189,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
 
 
     @Override
-    public void saveAllClients(Context context, String accountType)
-        throws AccountNotFoundException, AuthenticatorException, IOException,
-        OperationCanceledException {
+    public void saveAllClients(Context context, String accountType) {
 
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log_OC.d(TAG, "Saving sessions... ");
@@ -223,7 +212,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
         }
     }
 
-    private void keepCredentialsUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) {
+    private void keepCredentialsUpdated(OwnCloudClient reusedClient) {
         reusedClient.applyCredentials();
     }
 

From 33fd1037a3de3809391cc0484e1c3955a3c17225 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 2 Oct 2018 10:53:52 +0200
Subject: [PATCH 130/133] Update sample client to use new library

---
 .../lib/sampleclient/MainActivity.java        | 181 ++++++-----------
 .../lib/common/OwnCloudClientFactory.java     |   8 -
 .../common/OwnCloudClientManagerFactory.java  |   3 +-
 .../android/lib/common/http/HttpClient.java   |  20 +-
 .../lib/common/http/HttpConstants.java        |  10 +
 .../SelfSignedConfidentSslSocketFactory.java  | 185 ------------------
 .../lib/test_project/TestActivity.java        | 185 ++++++++----------
 .../lib/test_project/test/CopyFileTest.java   |   1 -
 .../test/GetCapabilitiesTest.java             |   1 -
 .../lib/test_project/test/GetShareesTest.java |   1 -
 .../lib/test_project/test/MoveFileTest.java   |   1 -
 .../test_project/test/OwnCloudClientTest.java |   1 -
 .../test/SingleSessionManagerTest.java        |   1 -
 .../test/UpdatePrivateShareTest.java          |   1 -
 .../test/UpdatePublicShareTest.java           |   1 -
 15 files changed, 158 insertions(+), 442 deletions(-)
 delete mode 100644 test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java

diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 72e61460..7f105d2c 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -24,7 +24,10 @@
 
 package com.owncloud.android.lib.sampleclient;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
@@ -38,22 +41,19 @@ import android.widget.Toast;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.account.OCAccount;
-import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.refactor.operations.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.refactor.operations.files.PropfindOperation;
-import com.owncloud.android.lib.refactor.operations.files.RemoveRemoteFileOperation;
-import com.owncloud.android.lib.refactor.operations.files.UploadRemoteFileOperation;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
-
-import at.bitfire.dav4android.DavResource;
+import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -63,13 +63,14 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import static android.content.ContentValues.TAG;
+
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
 	private static String LOG_TAG = MainActivity.class.getCanonicalName();
 	
 	private Handler mHandler;
 	private OwnCloudClient mClient;
-	private OCContext mOCContext;
 	private FilesArrayAdapter mFilesAdapter;
 	private View mFrame;
 	
@@ -82,15 +83,16 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         mHandler = new Handler();
         
     	final Uri serverUri = Uri.parse(getString(R.string.server_base_url));
+
+		OwnCloudClientManagerFactory.setUserAgent(getUserAgent());
     	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
 
-
-		OCAccount ocAccount = new OCAccount(serverUri,
+		mClient.setCredentials(
 				OwnCloudCredentialsFactory.newBasicCredentials(
-    					getString(R.string.username),
-    					getString(R.string.password)));
-
-    	mOCContext = new OCContext(ocAccount, getString(R.string.user_agent));
+						getString(R.string.username),
+						getString(R.string.password)
+				)
+		);
     	
     	mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
     	((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
@@ -153,32 +155,11 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     }
 
     private void startRefresh() {
-
-		final PropfindOperation propfindOperation = new PropfindOperation(mOCContext, FileUtils.PATH_SEPARATOR);
-		final Handler handler = new Handler();
-		new Thread(() -> {
-			final PropfindOperation.Result result = propfindOperation.exec();
-			final List<RemoteFile> remoteFiles = new ArrayList<>();
-			if(!result.isSuccess()) {
-				handler.post(() ->
-						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
-				return;
-			}
-//			for(DavResource el : result.getData().getMembers()) {
-//				remoteFiles.add(new RemoteFile(el));
-//			}
-			handler.post(() -> {
-				Toast.makeText(this, result.getData().getMembers().toString(), Toast.LENGTH_LONG).show();
-				mFilesAdapter.clear();
-				mFilesAdapter.addAll(remoteFiles);
-			});
-		}).start();
-//    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
-//    	refreshOperation.onExecute(mClient, this, mHandler);
+		ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
+		refreshOperation.execute(mClient, this, mHandler);
     }
     
     private void startUpload() {
-
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
     	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
@@ -188,29 +169,10 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		Long timeStampLong = fileToUpload.lastModified()/1000;
 		String timeStamp = timeStampLong.toString();
 
-		final UploadRemoteFileOperation uploadRemoteFileOperation = new UploadRemoteFileOperation(
-				mOCContext,
-				fileToUpload.getAbsolutePath(),
-				remotePath,
-				mimeType,
-				timeStamp
-		);
-		final Handler handler = new Handler();
-
-		new Thread(() -> {
-			final UploadRemoteFileOperation.Result result = uploadRemoteFileOperation.exec();
-			if (!result.isSuccess()) {
-				handler.post(() ->
-						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
-				return;
-			}
-			handler.post(() ->
-					Toast.makeText(this, "Upload successful", Toast.LENGTH_LONG).show());
-		}).start();
-
-//    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
-//    	uploadOperation.addDatatransferProgressListener(this);
-//    	uploadOperation.onExecute(mClient, this, mHandler);
+    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(),
+				remotePath, mimeType, timeStamp);
+    	uploadOperation.addDatatransferProgressListener(this);
+    	uploadOperation.execute(mClient, this, mHandler);
     }
 
     private void startRemoteDeletion() {
@@ -218,26 +180,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		File fileToUpload = upFolder.listFiles()[0];
 		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
 
-		final RemoveRemoteFileOperation removeRemoteFileOperation = new RemoveRemoteFileOperation(
-				mOCContext,
-				remotePath
-		);
-		final Handler handler = new Handler();
-
-		new Thread(() -> {
-			final RemoveRemoteFileOperation.Result result = removeRemoteFileOperation.exec();
-			if (!result.isSuccess()) {
-				handler.post(() ->
-						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
-				return;
-			}
-			handler.post(() ->
-					Toast.makeText(this, "Delete successful", Toast.LENGTH_LONG).show());
-		}).start();
-
-
-//    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
-//    	removeOperation.onExecute(mClient, this, mHandler);
+    	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
+    	removeOperation.execute(mClient, this, mHandler);
     }
 
     private void startDownload() {
@@ -247,31 +191,12 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     	File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
 
-		final DownloadRemoteFileOperation downloadRemoteFileOperation = new DownloadRemoteFileOperation(
-				mOCContext,
-				remotePath,
-				downFolder.getAbsolutePath()
-		);
-		final Handler handler = new Handler();
-
-		new Thread(() -> {
-			final DownloadRemoteFileOperation.Result result = downloadRemoteFileOperation.exec();
-			if (!result.isSuccess()) {
-				handler.post(() ->
-						Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_LONG).show());
-				return;
-			}
-			handler.post(() ->
-					Toast.makeText(this, "Download successful, pending file creation",
-							Toast.LENGTH_LONG).show());
-		}).start();
-
-//    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
-//    	downloadOperation.addDatatransferProgressListener(this);
-//    	downloadOperation.onExecute(mClient, this, mHandler);
+    	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath,
+				downFolder.getAbsolutePath());
+    	downloadOperation.addDatatransferProgressListener(this);
+    	downloadOperation.execute(mClient, this, mHandler);
     }
-    
-    @SuppressWarnings("deprecation")
+
 	private void startLocalDeletion() {
     	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
     	File downloadedFile = downFolder.listFiles()[0];
@@ -295,11 +220,11 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		} else if (operation instanceof com.owncloud.android.lib.resources.files.UploadRemoteFileOperation) {
 			onSuccessfulUpload((com.owncloud.android.lib.resources.files.UploadRemoteFileOperation)operation, result);
 			
-//		} else if (operation instanceof RemoveRemoteFileOperation ) {
-//			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);
-//
-//		} else if (operation instanceof DownloadRemoteFileOperation ) {
-//			onSuccessfulDownload((DownloadRemoteFileOperation)operation, result);
+		} else if (operation instanceof RemoveRemoteFileOperation ) {
+			onSuccessfulRemoteDeletion((RemoveRemoteFileOperation)operation, result);
+
+		} else if (operation instanceof DownloadRemoteFileOperation ) {
+			onSuccessfulDownload();
 			
 		} else {
 			Toast.makeText(this, R.string.todo_operation_finished_in_success, Toast.LENGTH_SHORT).show();
@@ -308,9 +233,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 	private void onSuccessfulRefresh(ReadRemoteFolderOperation operation, RemoteOperationResult result) {
 		mFilesAdapter.clear();
-		List<RemoteFile> files = new ArrayList<RemoteFile>();
-        for(Object obj: result.getData()) {
-            files.add((RemoteFile) obj);
+		List<RemoteFile> files = new ArrayList<>();
+        for(RemoteFile remoteFile: (List<RemoteFile>) result.getData()) {
+            files.add(remoteFile);
         }
 		if (files != null) {
 			Iterator<RemoteFile> it = files.iterator();
@@ -334,8 +259,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		}
 	}
 
-	@SuppressWarnings("deprecation")
-	private void onSuccessfulDownload(DownloadRemoteFileOperation operation, RemoteOperationResult result) {
+	private void onSuccessfulDownload() {
     	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
     	File downloadedFile = downFolder.listFiles()[0];
     	BitmapDrawable bDraw = new BitmapDrawable(getResources(), downloadedFile.getAbsolutePath());
@@ -352,9 +276,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
             public void run() {
 				TextView progressView = null;
 				if (upload) {
-					progressView = (TextView) findViewById(R.id.upload_progress);
+					progressView = findViewById(R.id.upload_progress);
 				} else {
-					progressView = (TextView) findViewById(R.id.download_progress);
+					progressView = findViewById(R.id.download_progress);
 				}
 				if (progressView != null) {
 	    			progressView.setText(Long.toString(percentage) + "%");
@@ -362,4 +286,25 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
             }
         });
 	}
+
+	// user agent
+	@SuppressLint("StringFormatInvalid")
+	private String getUserAgent() {
+		String appString = getResources().getString(R.string.user_agent);
+		String packageName = getPackageName();
+		String version = "";
+
+		PackageInfo pInfo;
+		try {
+			pInfo = getPackageManager().getPackageInfo(packageName, 0);
+			if (pInfo != null) {
+				version = pInfo.versionName;
+			}
+		} catch (PackageManager.NameNotFoundException e) {
+			Log_OC.e(TAG, "Trying to get packageName", e.getCause());
+		}
+
+		// Mozilla/5.0 (Android) ownCloud-android/1.7.0
+		return String.format(appString, version);
+	}
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 933703e6..7fd4a799 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -45,12 +45,6 @@ import java.io.IOException;
 public class OwnCloudClientFactory {
     
     final private static String TAG = OwnCloudClientFactory.class.getSimpleName();
-    
-    /** Default timeout for waiting data from the server */
-    public static final int DEFAULT_DATA_TIMEOUT = 60000;
-    
-    /** Default timeout for establishing a connection */
-    public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 
     /**
      * Creates a OwnCloudClient setup for an ownCloud account
@@ -157,8 +151,6 @@ public class OwnCloudClientFactory {
                                                       boolean followRedirects) {
         OwnCloudClient client = new OwnCloudClient(uri);
 
-        client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
-
         client.setFollowRedirects(followRedirects);
 
         client.setContext(context);
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
index fc675411..4fc6ea65 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
@@ -100,5 +100,4 @@ public class OwnCloudClientManagerFactory {
         }
         return false;
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 6a66cc28..a85e2a1c 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -102,6 +102,9 @@ public class HttpClient {
                 OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
                         .addInterceptor(getOkHttpInterceptor())
                         .protocols(Arrays.asList(Protocol.HTTP_1_1))
+                        .readTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
+                        .writeTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
+                        .connectTimeout(HttpConstants.DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
                         .followRedirects(false)
                         .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
                         .hostnameVerifier((asdf, usdf) -> true)
@@ -126,23 +129,6 @@ public class HttpClient {
         return sOkHttpInterceptor;
     }
 
-    /**
-     * Sets the connection and wait-for-data timeouts to be applied by default to the methods
-     * performed by this client.
-     */
-    public void setDefaultTimeouts(int defaultDataTimeout, int defaultConnectionTimeout) {
-        OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
-        if (defaultDataTimeout >= 0) {
-            clientBuilder
-                    .readTimeout(defaultDataTimeout, TimeUnit.MILLISECONDS)
-                    .writeTimeout(defaultDataTimeout, TimeUnit.MILLISECONDS);
-        }
-        if (defaultConnectionTimeout >= 0) {
-            clientBuilder.connectTimeout(defaultConnectionTimeout, TimeUnit.MILLISECONDS);
-        }
-        sOkHttpClient = clientBuilder.build();
-    }
-
     public void disableAutomaticCookiesHandling() {
         OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
         clientBuilder.cookieJar(new CookieJar() {
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index b7e07dce..35ed4784 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -174,4 +174,14 @@ public class HttpConstants {
     public static final int HTTP_HTTP_VERSION_NOT_SUPPORTED = 505;
     // 507 Insufficient Storage (WebDAV - RFC 2518)
     public static final int HTTP_INSUFFICIENT_STORAGE = 507;
+
+    /***********************************************************************************************************
+     *************************************************** TIMEOUTS **********************************************
+     ***********************************************************************************************************/
+
+    /** Default timeout for waiting data from the server */
+    public static final int DEFAULT_DATA_TIMEOUT = 60000;
+
+    /** Default timeout for establishing a connection */
+    public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 }
\ No newline at end of file
diff --git a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
deleted file mode 100644
index d9fc5c44..00000000
--- a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2018 ownCloud GmbH.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.test_project;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertStoreException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-/**
- * SelfSignedConfidentSslSocketFactory allows to create SSL {@link Socket}s 
- * that accepts self-signed server certificates.
- * 
- * WARNING: this SHOULD NOT be used in productive environments.
- * 
- * @author David A. Velasco
- * @author Christian Schabesberger
- */
-
-public class SelfSignedConfidentSslSocketFactory implements SecureProtocolSocketFactory {
-
-	
-	//private SSLContext mSslContext = null;
-	private AdvancedSslSocketFactory mWrappedSslSocketFactory = null;
-	
-	
-	/**
-	 * Constructor for SelfSignedConfidentSslSocketFactory.
-	 * @throws GeneralSecurityException 
-	 */
-	public SelfSignedConfidentSslSocketFactory() throws GeneralSecurityException {
-		SSLContext sslContext = SSLContext.getInstance("TLS");
-		sslContext.init(
-				null, 
-				new TrustManager[] { new SelfSignedConfidentX509TrustManager() }, 
-				null
-		);
-        mWrappedSslSocketFactory = new AdvancedSslSocketFactory(sslContext, null, null);		
-	}
-
-	
-	/**
-	 * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int)
-	 */
-	@Override
-	public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-		return mWrappedSslSocketFactory.createSocket(host, port);
-	}
-	
-	/**
-	 * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int)
-	 */
-	@Override
-	public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort)
-			throws IOException, UnknownHostException {
-		return mWrappedSslSocketFactory.createSocket(host, port, clientHost, clientPort);
-	}
-	
-	/**
-	 * Attempts to get a new socket connection to the given host within the given time limit.
-	 * 
-	 * @param host 			The host name/IP
-	 * @param port 			The port on the host
-	 * @param clientHost 	The local host name/IP to bind the socket to
-	 * @param clientPort 	The port on the local machine
-	 * @param params 		{@link HttpConnectionParams} HTTP connection parameters.
-	 * 
-	 * @return Socket 		A new socket
-	 * 
-	 * @throws IOException if an I/O error occurs while creating the socket
-	 * @throws UnknownHostException if the IP address of the host cannot be determined
-	 */
-	@Override
-	public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
-			HttpConnectionParams params) throws IOException, UnknownHostException,
-			ConnectTimeoutException {
-		
-		return mWrappedSslSocketFactory.createSocket(host, port, localAddress, localPort, params);
-	}
-
-	/**
-	  * @see SecureProtocolSocketFactory#createSocket(java.net.Socket,java.lang.String,int,boolean)
-	  */
-	@Override
-	public Socket createSocket(Socket socket, String host, int port, boolean autoClose)
-			throws IOException, UnknownHostException {
-		return mWrappedSslSocketFactory.createSocket(socket, host, port, autoClose);
-	}
-	
-	
-	public static class SelfSignedConfidentX509TrustManager implements X509TrustManager {
-
-	    private X509TrustManager mStandardTrustManager = null;
-
-		public SelfSignedConfidentX509TrustManager() 
-				throws NoSuchAlgorithmException, KeyStoreException, CertStoreException {
-			super();
-			TrustManagerFactory factory = TrustManagerFactory
-					.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-			factory.init((KeyStore)null);
-			mStandardTrustManager = findX509TrustManager(factory);
-		}
-
-		/**
-		 * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],String authType)
-		 */
-		@Override
-		public void checkClientTrusted(X509Certificate[] chain, String authType)
-				throws CertificateException {
-			mStandardTrustManager.checkClientTrusted(chain, authType);
-		}
-
-		/**
-		 * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],
-		 *      String authType)
-		 */
-		@Override
-		public void checkServerTrusted(X509Certificate[] chain, String authType)
-				throws CertificateException {
-			if (chain != null && chain.length == 1) {
-				chain[0].checkValidity();
-			} else {
-				mStandardTrustManager.checkServerTrusted(chain, authType);
-			}
-		}
-
-		/**
-		 * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers()
-		 */
-		public X509Certificate[] getAcceptedIssuers() {
-			return mStandardTrustManager.getAcceptedIssuers();
-		}
-	
-		/**
-		 * Locates the first X509TrustManager provided by a given TrustManagerFactory
-		 * @param factory               TrustManagerFactory to inspect in the search for a X509TrustManager
-		 * @return                      The first X509TrustManager found in factory.
-		 * @throws CertStoreException   When no X509TrustManager instance was found in factory
-		 */
-		private X509TrustManager findX509TrustManager(TrustManagerFactory factory) 
-				throws CertStoreException {
-			TrustManager tms[] = factory.getTrustManagers();
-			for (int i = 0; i < tms.length; i++) {
-				if (tms[i] instanceof X509TrustManager) {
-					return (X509TrustManager) tms[i];
-				}
-			}
-			return null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
index 3591bc18..f6f6ef38 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
@@ -1,22 +1,22 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2018 ownCloud GmbH.
- *   
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -24,15 +24,6 @@
 
 package com.owncloud.android.lib.test_project;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-
-
-
 import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
@@ -41,12 +32,8 @@ import android.util.Log;
 import android.view.Menu;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.common.network.NetworkUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.ChunkedUploadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
@@ -54,12 +41,18 @@ import com.owncloud.android.lib.resources.files.RemoteFile;
 import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.chunks.ChunkedUploadRemoteFileOperation;
 import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation;
 import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation;
 import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.users.GetRemoteUserQuotaOperation;
 import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation;
+import com.owncloud.android.lib.resources.users.GetRemoteUserQuotaOperation;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Activity to test OC framework
@@ -69,59 +62,43 @@ import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation;
  */
 
 public class TestActivity extends Activity {
-	
+
 	private static final String TAG = null;
 	// This account must exists on the server side
 	private String mServerUri;
 	private String mUser;
 	private String mPass;
-	
+
 	private static final int BUFFER_SIZE = 1024;
-	
+
 	public static final String ASSETS__TEXT_FILE_NAME = "textFile.txt";
 	public static final String ASSETS__IMAGE_FILE_NAME = "imageFile.png";
 	public static final String ASSETS__VIDEO_FILE_NAME = "videoFile.MP4";
-	
+
 	//private Account mAccount = null;
 	private OwnCloudClient mClient;
-	
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_test);
-		
+
 		mServerUri = getString(R.string.server_base_url);
 		mUser = getString(R.string.username);
 		mPass = getString(R.string.password);
-    	
-		Protocol pr = Protocol.getProtocol("https");
-		if (pr == null || !(pr.getSocketFactory() instanceof SelfSignedConfidentSslSocketFactory)) {
-			try {
-				ProtocolSocketFactory psf = new SelfSignedConfidentSslSocketFactory();
-				Protocol.registerProtocol(
-						"https",
-						new Protocol("https", psf, 443));
-				
-			} catch (GeneralSecurityException e) {
-				Log.e(TAG, "Self-signed confident SSL context could not be loaded");
-			}
-		}
-		
-		mClient = new OwnCloudClient(Uri.parse(mServerUri), NetworkUtils.getMultiThreadedConnManager());
-		mClient.setDefaultTimeouts(
-				OwnCloudClientFactory.DEFAULT_DATA_TIMEOUT, 
-				OwnCloudClientFactory.DEFAULT_CONNECTION_TIMEOUT);
+
+		mClient = new OwnCloudClient(Uri.parse(mServerUri));
 		mClient.setFollowRedirects(true);
 		mClient.setCredentials(
 				OwnCloudCredentialsFactory.newBasicCredentials(
-						mUser, 
+						mUser,
 						mPass
 				)
 		);
 		mClient.setBaseUri(Uri.parse(mServerUri));
-		
+
 		Log.v(TAG, "onCreate finished, ownCloud client ready");
-    	
+
 	}
 
 	@Override
@@ -134,57 +111,57 @@ public class TestActivity extends Activity {
 	/**
 	 * Access to the library method to Create a Folder
 	 * @param remotePath            Full path to the new directory to create in the remote server.
-     * @param createFullPath        'True' means that all the ancestor folders should be created if 
+     * @param createFullPath        'True' means that all the ancestor folders should be created if
      * 								don't exist yet.
-	 * 
+	 *
 	 * @return
 	 */
 	public RemoteOperationResult createFolder(String remotePath, boolean createFullPath) {
-		
+
 		return TestActivity.createFolder(remotePath, createFullPath, mClient);
 	}
 
 	/**
 	 * Access to the library method to Create a Folder
 	 * @param remotePath		Full path to the new directory to create in the remote server.
-     * @param createFullPath    'True' means that all the ancestor folders should be created if 
+     * @param createFullPath    'True' means that all the ancestor folders should be created if
      * 							don't exist yet.
 	 * @param client			Client instance configured to access the target OC server.
-	 * 
+	 *
 	 * @return	Result of the operation
 	 */
 	public static RemoteOperationResult createFolder(
 			String remotePath, boolean createFullPath, OwnCloudClient client
 		) {
-		
-		CreateRemoteFolderOperation createOperation = 
+
+		CreateRemoteFolderOperation createOperation =
 				new CreateRemoteFolderOperation(remotePath, createFullPath);
 		RemoteOperationResult result =  createOperation.execute(client);
-		
+
 		return result;
 	}
-	
+
 	/**
 	 * Access to the library method to Rename a File or Folder
 	 * @param oldName			Old name of the file.
      * @param oldRemotePath		Old remote path of the file. For folders it starts and ends by "/"
      * @param newName			New name to set as the name of file.
      * @param isFolder			'true' for folder and 'false' for files
-     * 
+     *
      * @return
      */
 
 	public RemoteOperationResult renameFile(String oldName, String oldRemotePath, String newName, boolean isFolder) {
-		
+
 		RenameRemoteFileOperation renameOperation = new RenameRemoteFileOperation(oldName, oldRemotePath, newName, isFolder);
 		RemoteOperationResult result = renameOperation.execute(mClient);
-		
+
 		return result;
 	}
-	
-	/** 
+
+	/**
 	 * Access to the library method to Remove a File or Folder
-	 * 
+	 *
 	 * @param remotePath	Remote path of the file or folder in the server.
 	 * @return
 	 */
@@ -193,10 +170,10 @@ public class TestActivity extends Activity {
 		RemoteOperationResult result = removeOperation.execute(mClient);
 		return result;
 	}
-	
-	/** 
+
+	/**
 	 * Access to the library method to Remove a File or Folder
-	 * 
+	 *
 	 * @param remotePath	Remote path of the file or folder in the server.
 	 * @return
 	 */
@@ -205,46 +182,46 @@ public class TestActivity extends Activity {
 		RemoteOperationResult result = removeOperation.execute(client);
 		return result;
 	}
-	
-		
+
+
 	/**
 	 * Access to the library method to Read a Folder (PROPFIND DEPTH 1)
 	 * @param remotePath
-	 * 
+	 *
 	 * @return
 	 */
 	public RemoteOperationResult readFile(String remotePath) {
-		
+
 		ReadRemoteFolderOperation readOperation= new ReadRemoteFolderOperation(remotePath);
 		RemoteOperationResult result = readOperation.execute(mClient);
 
 		return result;
 	}
-	
+
 	/**
 	 * Access to the library method to Download a File
 	 * @param remotePath
-	 * 
+	 *
 	 * @return
 	 */
 	public RemoteOperationResult downloadFile(RemoteFile remoteFile, String temporalFolder) {
-		// Create folder 
+		// Create folder
 		String path =  "/owncloud/tmp/" + temporalFolder;
 		File privateFolder = getFilesDir();
 		File folder = new File(privateFolder.getAbsolutePath() + "/" + path);
 		folder.mkdirs();
-		
+
 		DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remoteFile.getRemotePath(), folder.getAbsolutePath());
 		RemoteOperationResult result = downloadOperation.execute(mClient);
 
 		return result;
 	}
-	
-	/** Access to the library method to Upload a File 
+
+	/** Access to the library method to Upload a File
 	 * @param storagePath
 	 * @param remotePath
 	 * @param mimeType
-	 * 
+	 *
 	 * @return
 	 */
 	public RemoteOperationResult uploadFile(
@@ -253,13 +230,13 @@ public class TestActivity extends Activity {
 
 		return TestActivity.uploadFile(storagePath, remotePath, mimeType, mClient);
 	}
-	
-	/** Access to the library method to Upload a File 
+
+	/** Access to the library method to Upload a File
 	 * @param storagePath
 	 * @param remotePath
 	 * @param mimeType
 	 * @param client			Client instance configured to access the target OC server.
-	 * 
+	 *
 	 * @return
 	 */
 	public static RemoteOperationResult uploadFile(
@@ -271,31 +248,31 @@ public class TestActivity extends Activity {
         UploadRemoteFileOperation uploadOperation;
 
 		if ((new File(storagePath)).length() > ChunkedUploadRemoteFileOperation.CHUNK_SIZE ) {
-            uploadOperation = new ChunkedUploadRemoteFileOperation(
-            		storagePath, remotePath, mimeType, fileLastModifTimestamp
+            uploadOperation = new ChunkedUploadRemoteFileOperation("1",
+            		storagePath, remotePath, mimeType, TAG, fileLastModifTimestamp
     		);
         } else {
             uploadOperation = new UploadRemoteFileOperation(
             		storagePath, remotePath, mimeType, fileLastModifTimestamp
     		);
         }
-		
+
 		RemoteOperationResult result = uploadOperation.execute(client);
 		return result;
 	}
 
-	/** Access to the library method to Get Shares 
-	 * 
+	/** Access to the library method to Get Shares
+	 *
 	 * @return
 	 */
 	public RemoteOperationResult getShares(){
-		
+
 		GetRemoteSharesOperation getOperation = new GetRemoteSharesOperation();
 		RemoteOperationResult result = getOperation.execute(mClient);
-		
+
 		return result;
 	}
-	
+
 	/** Access to the library method to Create Share
 	 * @param path			Full path of the file/folder being shared. Mandatory argument
 	 * @param shareType		0 = user, 1 = group, 3 = Public link. Mandatory argument
@@ -310,33 +287,33 @@ public class TestActivity extends Activity {
 	 * 						16- Re-share
 	 * 						31- All above Default for private shares
 	 * 						For user or group shares.
-	 * 						To obtain combinations, add the desired values together.  
+	 * 						To obtain combinations, add the desired values together.
 	 * 						For instance, for Re-Share, delete, read, update add 16+8+2+1 = 27.
-	 * 
+	 *
 	 * @return
 	 */
-	public RemoteOperationResult createShare(String path, ShareType shareType, String shareWith, boolean publicUpload, 
+	public RemoteOperationResult createShare(String path, ShareType shareType, String shareWith, boolean publicUpload,
 			String password, int permissions){
-		
+
 		CreateRemoteShareOperation createOperation = new CreateRemoteShareOperation(path, shareType, shareWith, publicUpload, password, permissions);
 		RemoteOperationResult result = createOperation.execute(mClient);
-		
+
 		return result;
 	}
-	
-	
+
+
 	/**
 	 * Access to the library method to Remove Share
-	 * 
+	 *
 	 * @param idShare	Share ID
 	 */
-	
+
 	public RemoteOperationResult removeShare(int idShare) {
 		RemoveRemoteShareOperation removeOperation = new RemoveRemoteShareOperation(idShare);
 		RemoteOperationResult result = removeOperation.execute(mClient);
-		
+
 		return result;
-		
+
 	}
 
     public RemoteOperationResult getQuota(String remotePath) {
@@ -349,20 +326,20 @@ public class TestActivity extends Activity {
 		GetRemoteUserAvatarOperation getUserAvatarOperation = new GetRemoteUserAvatarOperation(dimension, etag);
 		return getUserAvatarOperation.execute(mClient);
 	}
-	
+
 	/**
 	 * Extracts file from AssetManager to cache folder.
-	 * 
+	 *
 	 * @param	fileName	Name of the asset file to extract.
 	 * @return				File instance of the extracted file.
 	 */
 	public File extractAsset(String fileName) throws IOException {
 		return TestActivity.extractAsset(fileName, this);
 	}
-	
+
 	/**
 	 * Extracts file from AssetManager to cache folder.
-	 * 
+	 *
 	 * @param	fileName	Name of the asset file to extract.
 	 * @param	context		Android context to access assets and file system.
 	 * @return				File instance of the extracted file.
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
index 9c6bf379..289c7846 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
@@ -37,7 +37,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.files.CopyRemoteFileOperation;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 import junit.framework.AssertionFailedError;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
index fa950575..9150d8fb 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
@@ -43,7 +43,6 @@ import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 
 /**
  * Class to test GetRemoteCapabilitiesOperation
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
index 9055c162..7140cb45 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
@@ -43,7 +43,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.shares.GetRemoteShareesOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
index 76215cb3..9b9e781f 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
@@ -41,7 +41,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.files.MoveRemoteFileOperation;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.content.Context;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
index 9d7dca35..f24ad35f 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
@@ -48,7 +48,6 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 
 
 /**
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
index 8ad850e8..ef0c0b99 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
@@ -36,7 +36,6 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.SingleSessionManager;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 
 import junit.framework.AssertionFailedError;
 
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
index 0873ddbc..bf31b06d 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
@@ -49,7 +49,6 @@ import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.shares.UpdateRemoteShareOperation;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 /**
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
index 3441b6ed..a54a37bd 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
@@ -50,7 +50,6 @@ import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.shares.UpdateRemoteShareOperation;
 import com.owncloud.android.lib.test_project.R;
-import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 /**

From 8841a0fcb7fe5baa786f8fa1f6c87d08b00ae030 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 2 Oct 2018 15:29:51 +0200
Subject: [PATCH 131/133] Include setup.xml for sample client

---
 .gitignore                         |  5 +----
 sample_client/res/values/setup.xml | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 sample_client/res/values/setup.xml

diff --git a/.gitignore b/.gitignore
index d217bb39..dd7c979e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,4 @@ tests/test_cases/local.properties
 proguard-project.txt
 sample_client/proguard-project.txt
 tests/proguard-project.txt
-tests/test_cases/proguard-project.txt
-
-# setup.xml login credentials
-sample_client/res/values/setup.xml
+tests/test_cases/proguard-project.txt
\ No newline at end of file
diff --git a/sample_client/res/values/setup.xml b/sample_client/res/values/setup.xml
new file mode 100644
index 00000000..281ea5fe
--- /dev/null
+++ b/sample_client/res/values/setup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  ownCloud Android Library is available under MIT license
+   Copyright (C) 2018 ownCloud GmbH.
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+ -->
+
+<resources>
+    <string name="server_base_url"></string>
+    <string name="username"></string>
+    <string name="password"></string>
+    <string name ="user_agent">Mozilla/5.0 (Android) ownCloud sample </string>
+</resources>
\ No newline at end of file

From 14ec6cb1eebec77e569cd9ec81ea55f98cc70abc Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 8 Oct 2018 10:57:56 +0200
Subject: [PATCH 132/133] Fix bug when restoring SAML cookies after expiring a
 SAML session

---
 .../owncloud/android/lib/common/DynamicSessionManager.java | 7 ++-----
 .../owncloud/android/lib/common/SimpleFactoryManager.java  | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/DynamicSessionManager.java b/src/com/owncloud/android/lib/common/DynamicSessionManager.java
index e478f383..46b477c3 100644
--- a/src/com/owncloud/android/lib/common/DynamicSessionManager.java
+++ b/src/com/owncloud/android/lib/common/DynamicSessionManager.java
@@ -56,11 +56,8 @@ public class DynamicSessionManager implements OwnCloudClientManager {
     }
 
     @Override
-    public void saveAllClients(Context context, String accountType)
-        throws AccountUtils.AccountNotFoundException,
-                AuthenticatorException, IOException, OperationCanceledException {
+    public void saveAllClients(Context context, String accountType) {
         mSimpleFactoryManager.saveAllClients(context, accountType);
         mSingleSessionManager.saveAllClients(context, accountType);
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/SimpleFactoryManager.java b/src/com/owncloud/android/lib/common/SimpleFactoryManager.java
index b955c517..f7d9e983 100644
--- a/src/com/owncloud/android/lib/common/SimpleFactoryManager.java
+++ b/src/com/owncloud/android/lib/common/SimpleFactoryManager.java
@@ -40,9 +40,8 @@ public class SimpleFactoryManager implements OwnCloudClientManager {
     private static final String TAG = SimpleFactoryManager.class.getSimpleName();
 
     @Override
-    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context)
-        throws AccountNotFoundException, OperationCanceledException, AuthenticatorException,
-        IOException {
+    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws
+            OperationCanceledException, AuthenticatorException, IOException {
 
         Log_OC.d(TAG, "getClientFor(OwnCloudAccount ... : ");
 

From fabf8d55f0b7105eb7a719004233a29d2613ac38 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 8 Oct 2018 15:04:55 +0200
Subject: [PATCH 133/133] Fix some downloads by disabling encoding

---
 src/com/owncloud/android/lib/common/http/HttpClient.java    | 1 +
 src/com/owncloud/android/lib/common/http/HttpConstants.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index a85e2a1c..a363b931 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -125,6 +125,7 @@ public class HttpClient {
             sOkHttpInterceptor = new HttpInterceptor();
             addHeaderForAllRequests(HttpConstants.USER_AGENT_HEADER, OwnCloudClientManagerFactory.getUserAgent());
             addHeaderForAllRequests(HttpConstants.PARAM_SINGLE_COOKIE_HEADER, "true");
+            addHeaderForAllRequests(HttpConstants.ACCEPT_ENCODING_HEADER, HttpConstants.ACCEPT_ENCODING_IDENTITY);
         }
         return sOkHttpInterceptor;
     }
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 35ed4784..cef4e75d 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -48,6 +48,8 @@ public class HttpConstants {
     public static final String LOCATION_HEADER = "Location";
     public static final String LOCATION_HEADER_LOWER = "location";
     public static final String CONTENT_TYPE_URLENCODED_UTF8 = "application/x-www-form-urlencoded; charset=utf-8";
+    public static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
+    public static final String ACCEPT_ENCODING_IDENTITY = "identity";
 
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************