From 0abc3a6b298134d180e10049902c8f98d492b290 Mon Sep 17 00:00:00 2001
From: theScrabi <chris.schabesberger@mailbox.org>
Date: Fri, 13 Apr 2018 08:59:58 +0200
Subject: [PATCH 01/25] fix empty screen

---
 .../owncloud/android/lib/common/network/WebdavEntry.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
index d93286b3..248350b3 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavEntry.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -1,5 +1,7 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+/** 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
@@ -164,7 +166,7 @@ public class WebdavEntry {
             prop = propSet.get(
                 EXTENDED_PROPERTY_NAME_PERMISSIONS, Namespace.getNamespace(NAMESPACE_OC)
             );
-            if (prop != null) {
+            if (prop != null && prop.getValue() != null) {
                 mPermissions = prop.getValue().toString();
             }
 

From e6640d395bef229a96d5725657c3363655d03c3c Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 29 Jan 2018 12:55:57 +0100
Subject: [PATCH 02/25] Testing network library

---
 build.gradle                                  |   1 +
 sample_client/res/layout/main.xml             |  19 ++-
 sample_client/res/values/strings.xml          |   1 +
 .../lib/sampleclient/MainActivity.java        | 115 ++++++++++++++----
 4 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/build.gradle b/build.gradle
index 64b3f1dd..2d95ce9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
+    compile 'com.squareup.okhttp3:okhttp:3.9.1'
 }
 
 android {
diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index c011ce78..e9140c82 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -31,11 +31,22 @@
     <Button
         android:id="@+id/button_refresh"
         style="@style/ButtonStyle"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:text="@string/refresh"
-        android:onClick="onClickHandler" 
-        />
+        android:onClick="onClickHandler"
+        android:text="@string/refresh"/>
+
+    <Button
+        android:id="@+id/button_check_server"
+        style="@style/ButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:onClick="onClickHandler"
+        android:text="@string/check_server"/>
 
     <ListView
         android:id="@+id/list_view"
diff --git a/sample_client/res/values/strings.xml b/sample_client/res/values/strings.xml
index 63a37cd9..783fbab1 100644
--- a/sample_client/res/values/strings.xml
+++ b/sample_client/res/values/strings.xml
@@ -26,6 +26,7 @@
 <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 3cb43f72..79accbe8 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -24,28 +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.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;
@@ -58,6 +36,36 @@ 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.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 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 okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Credentials;
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
 	private static String LOG_TAG = MainActivity.class.getCanonicalName();  
@@ -127,6 +135,9 @@ 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;
@@ -146,11 +157,65 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	    		Toast.makeText(this, R.string.youre_doing_it_wrong, Toast.LENGTH_SHORT).show();
     	}
     }
+
+    private void startCheck() {
+
+		OkHttpClient client = new OkHttpClient();
+
+		Request request = new Request.Builder()
+				.url("")
+				.get()
+				.build();
+
+		client.newCall(request).enqueue(new Callback() {
+			@Override public void onFailure(Call call, IOException e) {
+				e.printStackTrace();
+			}
+
+			@Override public void onResponse(Call call, Response response) throws IOException {
+				if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+
+				Headers responseHeaders = response.headers();
+				for (int i = 0, size = responseHeaders.size(); i < size; i++) {
+					System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
+				}
+
+				System.out.println(response.body().string());
+			}
+		});
+	}
     
     private void startRefresh() {
-    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
-    	refreshOperation.execute(mClient, this, mHandler);
-    }
+//    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
+//    	refreshOperation.execute(mClient, this, mHandler);
+
+		OkHttpClient client = new OkHttpClient();
+
+		String credentials = Credentials.basic("", "");
+
+		Request request = new Request.Builder()
+				.url("")
+				.addHeader("Authorization", credentials)
+				.method("PROPFIND", null)
+				.build();
+
+		client.newCall(request).enqueue(new Callback() {
+			@Override public void onFailure(Call call, IOException e) {
+				e.printStackTrace();
+			}
+
+			@Override public void onResponse(Call call, Response response) throws IOException {
+				if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+
+				Headers responseHeaders = response.headers();
+				for (int i = 0, size = responseHeaders.size(); i < size; i++) {
+					System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
+				}
+
+				System.out.println(response.body().string());
+			}
+		});
+	}
     
     private void startUpload() {
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));

From ede34920c2e2bef91c910012ff6f1833c56457ef Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 30 Jan 2018 12:55:36 +0100
Subject: [PATCH 03/25] Include feature to check server connections

---
 sample_client/res/layout/main.xml             | 76 +++++++++++------
 .../lib/sampleclient/MainActivity.java        | 85 +++++++++++++++++--
 2 files changed, 128 insertions(+), 33 deletions(-)

diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index e9140c82..17832baa 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -34,17 +34,20 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
+        android:enabled="false"
         android:onClick="onClickHandler"
-        android:text="@string/refresh"/>
+        android:text="@string/refresh"
+        android:visibility="invisible"/>
 
     <Button
         android:id="@+id/button_check_server"
         style="@style/ButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
+        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"/>
 
@@ -52,42 +55,45 @@
         android:id="@+id/list_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-		android:layout_below="@+id/button_refresh" 
         android:layout_above="@+id/button_upload"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
-        >
+        android:layout_below="@+id/button_refresh"
+        android:visibility="invisible">
     </ListView>
 
     <Button
         android:id="@+id/button_upload"
         style="@style/ButtonStyle"
-        android:layout_alignParentLeft="true"
         android:layout_above="@+id/frame"
+        android:layout_alignParentLeft="true"
+        android:enabled="false"
+        android:onClick="onClickHandler"
         android:text="@string/upload"
-        android:onClick="onClickHandler" 
-        />
+        android:visibility="invisible"/>
 
     <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_below="@id/list_view"
         android:layout_toLeftOf="@+id/button_delete_remote"
+        android:layout_toRightOf="@id/button_upload"
+        android:enabled="false"
         android:gravity="center"
-        android:textSize="14sp"
         android:text="0%"
-        />
+        android:textSize="14sp"
+        android:visibility="invisible"/>
 
     <Button
         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:layout_alignParentRight="true"
+        android:enabled="false"
+        android:onClick="onClickHandler"
+        android:text="@string/delete_remote_file"
+        android:visibility="invisible"/>
 
     <FrameLayout
         android:id="@id/frame"
@@ -104,30 +110,46 @@
         style="@style/ButtonStyle"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:text="@string/download" 
-        android:onClick="onClickHandler" 
-        />
+        android:enabled="false"
+        android:onClick="onClickHandler"
+        android:text="@string/download"
+        android:visibility="invisible"/>
 
     <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_below="@id/frame"
         android:layout_toLeftOf="@+id/button_delete_local"
+        android:layout_toRightOf="@id/button_download"
+        android:enabled="false"
         android:gravity="center"
-        android:textSize="14sp"
         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:text="@string/delete_local_file" 
-        android:onClick="onClickHandler" 
-        />
+        android:enabled="false"
+        android:onClick="onClickHandler"
+        android:text="@string/delete_local_file"
+        android:visibility="invisible"/>
+
+    <EditText
+        android:id="@+id/server_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/list_view"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="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"/>
 
 </RelativeLayout>
 
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 79accbe8..d5c97a2b 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -31,6 +31,7 @@ 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.ListView;
 import android.widget.TextView;
@@ -50,6 +51,9 @@ 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;
@@ -77,6 +81,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	private FilesArrayAdapter mFilesAdapter;
 	
 	private View mFrame;
+
+	private static final String NODE_VERSION = "version";
 	
     /** Called when the activity is first created. */
     @Override
@@ -160,27 +166,93 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
     private void startCheck() {
 
+    	String serverAddress = ((TextView) findViewById(R.id.server_address)).getText().toString();
+
+    	if (serverAddress.equals("")) {
+			Toast toast = Toast.makeText(getApplicationContext(),
+					"Introduce a server address", Toast.LENGTH_LONG);
+
+			toast.setGravity(Gravity.CENTER,0,0);
+
+			toast.show();
+
+			return;
+		}
+
 		OkHttpClient client = new OkHttpClient();
 
 		Request request = new Request.Builder()
-				.url("")
+				.url(serverAddress + "/status.php")
 				.get()
 				.build();
 
 		client.newCall(request).enqueue(new Callback() {
-			@Override public void onFailure(Call call, IOException e) {
+
+			@Override public void onFailure(Call call, final IOException e) {
+				runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+
+						Toast toast = Toast.makeText(getApplicationContext(),
+								"Request failed: " + e.toString(), Toast.LENGTH_LONG);
+
+						toast.setGravity(Gravity.CENTER,0,0);
+
+						toast.show();
+					}
+				});
 				e.printStackTrace();
 			}
 
-			@Override public void onResponse(Call call, Response response) throws IOException {
-				if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+			@Override public void onResponse(Call call, final Response response) throws IOException {
+
+				if (!response.isSuccessful()) {
+
+					runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+
+							Toast toast = Toast.makeText(getApplicationContext(),
+									"Response not successful with code " + response.code(), Toast.LENGTH_LONG);
+
+							toast.setGravity(Gravity.CENTER,0,0);
+
+							toast.show();
+						}
+					});
+
+					throw new IOException("Unexpected code " + response);
+				}
+
+				try { // Response successful
+
+					String jsonData = response.body().string();
+
+					JSONObject Jobject = new JSONObject(jsonData);
+
+					final String serverVersion = Jobject.get("version").toString();
+
+					runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+
+							Toast toast = Toast.makeText(getApplicationContext(),
+									"Server with version " + serverVersion + " detected", Toast.LENGTH_LONG);
+
+							toast.setGravity(Gravity.CENTER,0,0);
+
+							toast.show();
+						}
+					});
+
+				} 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));
 				}
-
-				System.out.println(response.body().string());
 			}
 		});
 	}
@@ -205,6 +277,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			}
 
 			@Override public void onResponse(Call call, Response response) throws IOException {
+
 				if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
 
 				Headers responseHeaders = response.headers();

From d79bdb78931456a8679de58798f2063e4e3112cc Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 17 Apr 2018 18:37:00 +0200
Subject: [PATCH 04/25] Test PROPFIND with new endpoind and new network library

---
 build.gradle                                  |   2 +-
 sample_client/AndroidManifest.xml             |  35 +--
 sample_client/res/layout/main.xml             | 191 ++++++++--------
 .../lib/sampleclient/MainActivity.java        | 216 ++++++++++--------
 4 files changed, 241 insertions(+), 203 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2d95ce9b..c97858bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
-    compile 'com.squareup.okhttp3:okhttp:3.9.1'
+    compile 'com.squareup.okhttp3:okhttp:3.10.0'
 }
 
 android {
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index df33bb06..a2697540 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -22,24 +22,29 @@
    THE SOFTWARE.
 
  -->
- 
+
 <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="8"
-        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"                  
-                  >
+        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"
+            >
             <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/res/layout/main.xml b/sample_client/res/layout/main.xml
index 17832baa..e762d978 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -22,26 +22,27 @@
    THE SOFTWARE.
 
  -->
- 
+
 <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"
     >
 
-    <Button
-        android:id="@+id/button_refresh"
-        style="@style/ButtonStyle"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
+    <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:enabled="false"
-        android:onClick="onClickHandler"
-        android:text="@string/refresh"
-        android:visibility="invisible"/>
+        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"
-        style="@style/ButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/server_address"
@@ -51,105 +52,103 @@
         android:onClick="onClickHandler"
         android:text="@string/check_server"/>
 
+    <Button
+        android:id="@+id/button_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/server_address"
+        android:layout_marginTop="10dp"
+        android:onClick="onClickHandler"
+        android:text="@string/refresh"
+        android:visibility="visible"/>
+
     <ListView
         android:id="@+id/list_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/button_upload"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/button_refresh"
         android:visibility="invisible">
     </ListView>
 
-    <Button
-        android:id="@+id/button_upload"
-        style="@style/ButtonStyle"
-        android:layout_above="@+id/frame"
-        android:layout_alignParentLeft="true"
-        android:enabled="false"
-        android:onClick="onClickHandler"
-        android:text="@string/upload"
-        android:visibility="invisible"/>
+    <!--<Button-->
+    <!--android:id="@+id/button_upload"-->
+    <!--style="@style/ButtonStyle"-->
+    <!--android:layout_above="@+id/frame"-->
+    <!--android:layout_alignParentLeft="true"-->
+    <!--android:enabled="false"-->
+    <!--android:onClick="onClickHandler"-->
+    <!--android:text="@string/upload"-->
+    <!--android:visibility="invisible"/>-->
 
-    <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"/>
+    <!--<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"/>
+    <!--<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"
-        >
-    </FrameLayout>
+    <!--<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"/>
+    <!--<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"/>
+    <!--<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"/>
-
-    <EditText
-        android:id="@+id/server_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/list_view"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="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_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"/>-->
 
 </RelativeLayout>
 
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 d5c97a2b..226ee397 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
@@ -83,6 +83,16 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	private View mFrame;
 
 	private static final String NODE_VERSION = "version";
+
+	private static final String URL = "TO COMPLETE";
+
+	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 USERNAME = "TO COMPLETE";
+
+	private static final String PASSWORD = "TO COMPLETE";
 	
     /** Called when the activity is first created. */
     @Override
@@ -125,7 +135,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			Log.e(LOG_TAG, getString(R.string.error_copying_sample_file), e);
 		}
 		
-		mFrame = findViewById(R.id.frame);
+//		mFrame = findViewById(R.id.frame);
     }
     
     
@@ -147,18 +157,18 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	    	case R.id.button_refresh:
 	    		startRefresh();
 	    		break;
-	    	case R.id.button_upload:
-	    		startUpload();
-	    		break;
-	    	case R.id.button_delete_remote:
-	    		startRemoteDeletion();
-	    		break;
-	    	case R.id.button_download:
-	    		startDownload();
-	    		break;
-	    	case R.id.button_delete_local:
-	    		startLocalDeletion();
-	    		break;
+//	    	case R.id.button_upload:
+//	    		startUpload();
+//	    		break;
+//	    	case R.id.button_delete_remote:
+//	    		startRemoteDeletion();
+//	    		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();
     	}
@@ -168,16 +178,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
     	String serverAddress = ((TextView) findViewById(R.id.server_address)).getText().toString();
 
-    	if (serverAddress.equals("")) {
-			Toast toast = Toast.makeText(getApplicationContext(),
-					"Introduce a server address", Toast.LENGTH_LONG);
-
-			toast.setGravity(Gravity.CENTER,0,0);
-
-			toast.show();
-
-			return;
-		}
+		if (!validServerAddress(serverAddress)) return;
 
 		OkHttpClient client = new OkHttpClient();
 
@@ -188,6 +189,47 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 		client.newCall(request).enqueue(new Callback() {
 
+			@Override public void onResponse(Call call, final Response response) throws IOException {
+
+				if (!response.isSuccessful()) {
+
+					runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+
+							showToastMessage("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();
+
+					runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+
+							showToastMessage("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) {
 				runOnUiThread(new Runnable() {
 					@Override
@@ -203,6 +245,31 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 				});
 				e.printStackTrace();
 			}
+		});
+	}
+
+	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);
+
+		String serverAddress = ((TextView) findViewById(R.id.server_address)).getText().toString();
+
+		if (!validServerAddress(serverAddress)) return;
+
+		OkHttpClient client = new OkHttpClient();
+
+		String credentials = Credentials.basic(USERNAME, PASSWORD);
+
+		final Request request = new Request.Builder()
+				.url(URL + NEW_WEBDAV_PATH + USERNAME)
+				.addHeader("Authorization", credentials)
+				.method("PROPFIND", null)
+				.build();
+
+		client.newCall(request).enqueue(new Callback() {
 
 			@Override public void onResponse(Call call, final Response response) throws IOException {
 
@@ -212,81 +279,33 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 						@Override
 						public void run() {
 
-							Toast toast = Toast.makeText(getApplicationContext(),
-									"Response not successful with code " + response.code(), Toast.LENGTH_LONG);
-
-							toast.setGravity(Gravity.CENTER,0,0);
-
-							toast.show();
+							showToastMessage("Response not successful with code " + response.code());
 						}
 					});
 
 					throw new IOException("Unexpected code " + response);
-				}
 
-				try { // Response successful
+				} else { // Successful response
 
-					String jsonData = response.body().string();
-
-					JSONObject Jobject = new JSONObject(jsonData);
-
-					final String serverVersion = Jobject.get("version").toString();
+					final String propFindResult = response.body().string();
 
 					runOnUiThread(new Runnable() {
 						@Override
 						public void run() {
-
-							Toast toast = Toast.makeText(getApplicationContext(),
-									"Server with version " + serverVersion + " detected", Toast.LENGTH_LONG);
-
-							toast.setGravity(Gravity.CENTER,0,0);
-
-							toast.show();
+							showToastMessage(propFindResult);
 						}
 					});
 
-				} 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));
+					Headers responseHeaders = response.headers();
+					for (int i = 0, size = responseHeaders.size(); i < size; i++) {
+						System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
+					}
 				}
 			}
-		});
-	}
-    
-    private void startRefresh() {
-//    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
-//    	refreshOperation.execute(mClient, this, mHandler);
 
-		OkHttpClient client = new OkHttpClient();
-
-		String credentials = Credentials.basic("", "");
-
-		Request request = new Request.Builder()
-				.url("")
-				.addHeader("Authorization", credentials)
-				.method("PROPFIND", null)
-				.build();
-
-		client.newCall(request).enqueue(new Callback() {
 			@Override public void onFailure(Call call, IOException e) {
 				e.printStackTrace();
 			}
-
-			@Override public void onResponse(Call call, Response response) throws IOException {
-
-				if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
-
-				Headers responseHeaders = response.headers();
-				for (int i = 0, size = responseHeaders.size(); i < size; i++) {
-					System.out.println(responseHeaders.name(i) + ": " + responseHeaders.value(i));
-				}
-
-				System.out.println(response.body().string());
-			}
 		});
 	}
     
@@ -331,8 +350,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);
     	}
     }
 
@@ -381,10 +400,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")
@@ -404,11 +423,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) + "%");
 				}
@@ -416,4 +435,19 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         });
 	}
 
+	private boolean validServerAddress(String serverAddress) {
+		if (serverAddress.equals("") || (!serverAddress.contains("http://") && !serverAddress.contains("https://"))) {
+			showToastMessage("Introduce a proper server address with http/https");
+			return false;
+		}
+		return true;
+	}
+
+	private void showToastMessage(String message) {
+		Toast toast = Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG);
+
+		toast.setGravity(Gravity.CENTER, 0, 0);
+
+		toast.show();
+	}
 }

From bdd6a1be0cc30cbe3ad8aedb51b83b751e59ca45 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 18 Apr 2018 11:03:28 +0200
Subject: [PATCH 05/25] Refactor MainActivity and start implementing upload

---
 sample_client/res/layout/main.xml             |  28 +--
 .../lib/sampleclient/MainActivity.java        | 164 ++++++++++++------
 2 files changed, 124 insertions(+), 68 deletions(-)

diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index e762d978..39a730ef 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -64,25 +64,25 @@
         android:text="@string/refresh"
         android:visibility="visible"/>
 
-    <ListView
-        android:id="@+id/list_view"
+    <Button
+        android:id="@+id/button_upload"
         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>
+        android:layout_below="@id/button_refresh"
+        android:layout_marginTop="10dp"
+        android:onClick="onClickHandler"
+        android:text="@string/upload"/>
 
-    <!--<Button-->
-    <!--android:id="@+id/button_upload"-->
-    <!--style="@style/ButtonStyle"-->
-    <!--android:layout_above="@+id/frame"-->
+    <!--<ListView-->
+    <!--android:id="@+id/list_view"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
     <!--android:layout_alignParentLeft="true"-->
-    <!--android:enabled="false"-->
-    <!--android:onClick="onClickHandler"-->
-    <!--android:text="@string/upload"-->
-    <!--android:visibility="invisible"/>-->
+    <!--android:layout_alignParentRight="true"-->
+    <!--android:layout_below="@+id/button_refresh"-->
+    <!--android:visibility="invisible">-->
+    <!--</ListView>-->
 
     <!--<TextView-->
     <!--android:id="@+id/upload_progress"-->
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 226ee397..0630910e 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,7 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   @author David González Verdugo
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -33,13 +35,13 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
-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.authentication.OwnCloudCredentialsFactory;
+import com.owncloud.android.lib.common.network.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -51,6 +53,7 @@ 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.apache.commons.httpclient.methods.RequestEntity;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -66,8 +69,11 @@ import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Credentials;
 import okhttp3.Headers;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
@@ -93,6 +99,14 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	private static final String USERNAME = "TO COMPLETE";
 
 	private static final String PASSWORD = "TO COMPLETE";
+
+	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 OkHttpClient mOkHttpClient;
+
+	private String mCredentials;
 	
     /** Called when the activity is first created. */
     @Override
@@ -112,7 +126,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();
@@ -134,6 +148,12 @@ 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(URL);
+
+		mOkHttpClient = new OkHttpClient();
+
+		mCredentials = Credentials.basic(USERNAME, PASSWORD);
 		
 //		mFrame = findViewById(R.id.frame);
     }
@@ -157,9 +177,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	    	case R.id.button_refresh:
 	    		startRefresh();
 	    		break;
-//	    	case R.id.button_upload:
-//	    		startUpload();
-//	    		break;
+	    	case R.id.button_upload:
+	    		startUpload();
+	    		break;
 //	    	case R.id.button_delete_remote:
 //	    		startRemoteDeletion();
 //	    		break;
@@ -176,30 +196,20 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
     private void startCheck() {
 
-    	String serverAddress = ((TextView) findViewById(R.id.server_address)).getText().toString();
-
-		if (!validServerAddress(serverAddress)) return;
-
-		OkHttpClient client = new OkHttpClient();
+		if (!validServerAddress()) return;
 
 		Request request = new Request.Builder()
-				.url(serverAddress + "/status.php")
+				.url(URL + "/status.php")
 				.get()
 				.build();
 
-		client.newCall(request).enqueue(new Callback() {
+		mOkHttpClient.newCall(request).enqueue(new Callback() {
 
 			@Override public void onResponse(Call call, final Response response) throws IOException {
 
 				if (!response.isSuccessful()) {
 
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-
-							showToastMessage("Response not successful with code " + response.code());
-						}
-					});
+					showUnsuccessfulMessage(response.code());
 
 					throw new IOException("Unexpected code " + response);
 				}
@@ -212,13 +222,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 					final String serverVersion = Jobject.get("version").toString();
 
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-
-							showToastMessage("Server with version " + serverVersion + " detected");
-						}
-					});
+					showSuccessfulMessage("Server with version " + serverVersion + " detected");
 
 				} catch (JSONException e) {
 					e.printStackTrace();
@@ -255,33 +259,21 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 //    	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
 //    	refreshOperation.execute(mClient, this, mHandler);
 
-		String serverAddress = ((TextView) findViewById(R.id.server_address)).getText().toString();
-
-		if (!validServerAddress(serverAddress)) return;
-
-		OkHttpClient client = new OkHttpClient();
-
-		String credentials = Credentials.basic(USERNAME, PASSWORD);
+		if (!validServerAddress()) return;
 
 		final Request request = new Request.Builder()
 				.url(URL + NEW_WEBDAV_PATH + USERNAME)
-				.addHeader("Authorization", credentials)
+				.addHeader("Authorization", mCredentials)
 				.method("PROPFIND", null)
 				.build();
 
-		client.newCall(request).enqueue(new Callback() {
+		mOkHttpClient.newCall(request).enqueue(new Callback() {
 
 			@Override public void onResponse(Call call, final Response response) throws IOException {
 
 				if (!response.isSuccessful()) {
 
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-
-							showToastMessage("Response not successful with code " + response.code());
-						}
-					});
+					showUnsuccessfulMessage(response.code());
 
 					throw new IOException("Unexpected code " + response);
 
@@ -289,12 +281,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 					final String propFindResult = response.body().string();
 
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							showToastMessage(propFindResult);
-						}
-					});
+					showSuccessfulMessage(propFindResult);
 
 					Headers responseHeaders = response.headers();
 					for (int i = 0, size = responseHeaders.size(); i < size; i++) {
@@ -310,21 +297,67 @@ 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(); 
     	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();
 
-    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
-    	uploadOperation.addDatatransferProgressListener(this);
-    	uploadOperation.execute(mClient, this, mHandler);
+		RequestEntity entity  = new FileRequestEntity(fileToUpload, mimeType);
+
+//		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 = new MultipartBody.Builder().setType(MultipartBody.FORM)
+				.addFormDataPart("testImage", fileToUpload.getName(), RequestBody.create(mediaType, fileToUpload))
+				.build();
+
+		final Request request = new Request.Builder()
+				.url(URL + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.addHeader("Authorization", mCredentials)
+				.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()) {
+
+					showUnsuccessfulMessage(response.code());
+
+					throw new IOException("Unexpected code " + response);
+
+				} else { // Successful response
+
+					final String putResult = response.body().string();
+
+					showSuccessfulMessage(putResult);
+				}
+			}
+
+			@Override public void onFailure(Call call, IOException e) {
+				e.printStackTrace();
+			}
+		});
+
     }
-    
-    private void startRemoteDeletion() {
+
+	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();
@@ -435,7 +468,10 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
         });
 	}
 
-	private boolean validServerAddress(String serverAddress) {
+	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;
@@ -443,6 +479,26 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		return true;
 	}
 
+	private void showUnsuccessfulMessage (final int errorCode) {
+		runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+
+				showToastMessage("Response not successful with code " + String.valueOf(errorCode));
+			}
+		});
+	}
+
+	private void showSuccessfulMessage (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);
 

From f3a080e9a83195c452f64aa2ccf91f266c54109b Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 18 Apr 2018 13:32:38 +0200
Subject: [PATCH 06/25] Keep working on uploads

---
 sample_client/assets/oc_sample.txt            |  1 +
 sample_client/res/values/strings.xml          |  2 +-
 .../lib/sampleclient/MainActivity.java        | 27 +++++++++++--------
 3 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 sample_client/assets/oc_sample.txt

diff --git a/sample_client/assets/oc_sample.txt b/sample_client/assets/oc_sample.txt
new file mode 100644
index 00000000..49254be3
--- /dev/null
+++ b/sample_client/assets/oc_sample.txt
@@ -0,0 +1 @@
+Testing ownCloud uploads
diff --git a/sample_client/res/values/strings.xml b/sample_client/res/values/strings.xml
index 783fbab1..6ef9c46c 100644
--- a/sample_client/res/values/strings.xml
+++ b/sample_client/res/values/strings.xml
@@ -42,7 +42,7 @@
     <string name="upload_folder_path">to_upload</string>
     <string name="download_folder_path">downloaded</string>
     <string name="error_copying_sample_file">Sample file could not be saved in temporal folder; upload will not work</string>
-    <string name="sample_file_name">oc_sample.png</string>    
+    <string name="sample_file_name">oc_sample.png</string>
     <string name="sample_file_mimetype">image/png</string>
     <string name="error_deleting_local_file">Downloaded file could not be deleted</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 0630910e..ca1128fc 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -41,7 +41,6 @@ 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.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -53,7 +52,6 @@ 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.apache.commons.httpclient.methods.RequestEntity;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -102,7 +100,12 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 	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 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 OkHttpClient mOkHttpClient;
 
@@ -263,7 +266,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 		final Request request = new Request.Builder()
 				.url(URL + NEW_WEBDAV_PATH + USERNAME)
-				.addHeader("Authorization", mCredentials)
+				.addHeader(AUTHORIZATION_HEADER, mCredentials)
+				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
 				.method("PROPFIND", null)
 				.build();
 
@@ -309,8 +313,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		Long timeStampLong = fileToUpload.lastModified()/1000;
 		String timeStamp = timeStampLong.toString();
 
-		RequestEntity entity  = new FileRequestEntity(fileToUpload, mimeType);
-
 //		Let's first use OKHttp with the new endpoint without depending on our library operations
 
 //    	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
@@ -319,19 +321,22 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 		if (!validServerAddress()) return;
 
-		RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM)
-				.addFormDataPart("testImage", fileToUpload.getName(), RequestBody.create(mediaType, fileToUpload))
+		RequestBody requestBody = new MultipartBody.Builder()
+				.setType(MultipartBody.FORM)
+				.addFormDataPart("data", fileToUpload.getName(), RequestBody.create(mediaType, fileToUpload))
+                .addFormDataPart("name", fileToUpload.getName())
 				.build();
 
 		final Request request = new Request.Builder()
 				.url(URL + NEW_WEBDAV_PATH + USERNAME + remotePath)
-				.addHeader("Authorization", mCredentials)
+				.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 {
@@ -346,7 +351,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 					final String putResult = response.body().string();
 
-					showSuccessfulMessage(putResult);
+					showSuccessfulMessage("Successful upload");
 				}
 			}
 

From bc32ddda0fffbe38e37655c5911b1dee7ab8cedf Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 19 Apr 2018 13:22:27 +0200
Subject: [PATCH 07/25] Test download

---
 sample_client/res/layout/main.xml             | 21 +++++-
 .../lib/sampleclient/MainActivity.java        | 67 ++++++++++++++-----
 2 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index 39a730ef..4247bcfe 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -61,8 +61,7 @@
         android:layout_below="@id/server_address"
         android:layout_marginTop="10dp"
         android:onClick="onClickHandler"
-        android:text="@string/refresh"
-        android:visibility="visible"/>
+        android:text="@string/refresh"/>
 
     <Button
         android:id="@+id/button_upload"
@@ -74,6 +73,24 @@
         android:onClick="onClickHandler"
         android:text="@string/upload"/>
 
+    <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:onClick="onClickHandler"
+        android:text="@string/download"/>
+
+    <!--<Button-->
+    <!--android:id="@+id/button_delete_remote"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignParentLeft="true"-->
+    <!--android:onClick="onClickHandler"-->
+    <!--android:text="@string/delete_remote_file"/>-->
+
     <!--<ListView-->
     <!--android:id="@+id/list_view"-->
     <!--android:layout_width="match_parent"-->
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 ca1128fc..4bf84f33 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -183,6 +183,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	    	case R.id.button_upload:
 	    		startUpload();
 	    		break;
+			case R.id.button_download:
+	    		startDownload();
+	    		break;
 //	    	case R.id.button_delete_remote:
 //	    		startRemoteDeletion();
 //	    		break;
@@ -303,7 +306,7 @@ 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];
+    	final File fileToUpload = upFolder.listFiles()[0];
     	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName(); 
     	String mimeType = getString(R.string.sample_file_mimetype);
 
@@ -349,9 +352,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 				} else { // Successful response
 
-					final String putResult = response.body().string();
-
-					showSuccessfulMessage("Successful upload");
+					showSuccessfulMessage("Successful upload of " + fileToUpload.getName());
 				}
 			}
 
@@ -359,9 +360,54 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 				e.printStackTrace();
 			}
 		});
-
     }
 
+	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();
+
+		if (!validServerAddress()) return;
+
+//		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);
+
+		final Request request = new Request.Builder()
+				.url(URL + NEW_WEBDAV_PATH + 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()) {
+
+					showUnsuccessfulMessage(response.code());
+
+					throw new IOException("Unexpected code " + response);
+
+				} else { // Successful response
+
+					showSuccessfulMessage("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();
+			}
+		});
+	}
+
 	private void startRemoteDeletion() {
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
     	File fileToUpload = upFolder.listFiles()[0]; 
@@ -370,17 +416,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
     	removeOperation.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));
-    	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")
 	private void startLocalDeletion() {
     	File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));

From 872c82b79a338880b9b25e3f134bf6e65d6a9920 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 19 Apr 2018 13:57:49 +0200
Subject: [PATCH 08/25] Test remote deletion

---
 sample_client/res/layout/main.xml             |  16 +--
 .../lib/sampleclient/MainActivity.java        | 108 ++++++++++--------
 2 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index 4247bcfe..6a15c528 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -83,13 +83,15 @@
         android:onClick="onClickHandler"
         android:text="@string/download"/>
 
-    <!--<Button-->
-    <!--android:id="@+id/button_delete_remote"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignParentLeft="true"-->
-    <!--android:onClick="onClickHandler"-->
-    <!--android:text="@string/delete_remote_file"/>-->
+    <Button
+        android:id="@+id/button_delete_remote"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@id/button_download"
+        android:layout_marginTop="10dp"
+        android:onClick="onClickHandler"
+        android:text="@string/delete_remote_file"/>
 
     <!--<ListView-->
     <!--android:id="@+id/list_view"-->
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 4bf84f33..43f204fd 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -88,7 +88,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 	private static final String NODE_VERSION = "version";
 
-	private static final String URL = "TO COMPLETE";
+	private static final String SERVER_ADDRESS = "TO COMPLETE";
 
 	private static final String WEBDAV_PATH_4_0 = "/remote.php/webdav/";
 
@@ -152,7 +152,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			Log.e(LOG_TAG, getString(R.string.error_copying_sample_file), e);
 		}
 
-		((TextView) findViewById(R.id.server_address)).setText(URL);
+		((TextView) findViewById(R.id.server_address)).setText(SERVER_ADDRESS);
 
 		mOkHttpClient = new OkHttpClient();
 
@@ -186,12 +186,9 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			case R.id.button_download:
 	    		startDownload();
 	    		break;
-//	    	case R.id.button_delete_remote:
-//	    		startRemoteDeletion();
-//	    		break;
-//	    	case R.id.button_download:
-//	    		startDownload();
-//	    		break;
+	    	case R.id.button_delete_remote:
+	    		startRemoteDeletion();
+	    		break;
 //	    	case R.id.button_delete_local:
 //	    		startLocalDeletion();
 //	    		break;
@@ -205,7 +202,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		if (!validServerAddress()) return;
 
 		Request request = new Request.Builder()
-				.url(URL + "/status.php")
+				.url(SERVER_ADDRESS + "/status.php")
 				.get()
 				.build();
 
@@ -215,7 +212,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 				if (!response.isSuccessful()) {
 
-					showUnsuccessfulMessage(response.code());
+					showMessage("Response not successful with code: " + response.code());
 
 					throw new IOException("Unexpected code " + response);
 				}
@@ -228,7 +225,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 					final String serverVersion = Jobject.get("version").toString();
 
-					showSuccessfulMessage("Server with version " + serverVersion + " detected");
+					showMessage("Server with version " + serverVersion + " detected");
 
 				} catch (JSONException e) {
 					e.printStackTrace();
@@ -241,19 +238,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			}
 
 			@Override public void onFailure(Call call, final IOException e) {
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-
-						Toast toast = Toast.makeText(getApplicationContext(),
-								"Request failed: " + e.toString(), Toast.LENGTH_LONG);
-
-						toast.setGravity(Gravity.CENTER,0,0);
-
-						toast.show();
-					}
-				});
 				e.printStackTrace();
+				showMessage("Something was wrong: " + e.toString());
 			}
 		});
 	}
@@ -268,7 +254,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		if (!validServerAddress()) return;
 
 		final Request request = new Request.Builder()
-				.url(URL + NEW_WEBDAV_PATH + USERNAME)
+				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME)
 				.addHeader(AUTHORIZATION_HEADER, mCredentials)
 				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
 				.method("PROPFIND", null)
@@ -280,7 +266,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 				if (!response.isSuccessful()) {
 
-					showUnsuccessfulMessage(response.code());
+					showMessage("Response not successful with code: " + response.code());
 
 					throw new IOException("Unexpected code " + response);
 
@@ -288,7 +274,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 					final String propFindResult = response.body().string();
 
-					showSuccessfulMessage(propFindResult);
+					showMessage(propFindResult);
 
 					Headers responseHeaders = response.headers();
 					for (int i = 0, size = responseHeaders.size(); i < size; i++) {
@@ -298,6 +284,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			}
 
 			@Override public void onFailure(Call call, IOException e) {
+				showMessage("Something was wrong: " + e.toString());
 				e.printStackTrace();
 			}
 		});
@@ -331,7 +318,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 				.build();
 
 		final Request request = new Request.Builder()
-				.url(URL + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME + remotePath)
 				.addHeader(AUTHORIZATION_HEADER, mCredentials)
 				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
                 .addHeader(CONTENT_TYPE_HEADER, CONTENT_TYPE_VALUE)
@@ -346,18 +333,19 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 				if (!response.isSuccessful()) {
 
-					showUnsuccessfulMessage(response.code());
+					showMessage("Response not successful with code: " + response.code());
 
 					throw new IOException("Unexpected code " + response);
 
 				} else { // Successful response
 
-					showSuccessfulMessage("Successful upload of " + fileToUpload.getName());
+					showMessage("Successful upload of " + fileToUpload.getName());
 				}
 			}
 
 			@Override public void onFailure(Call call, IOException e) {
 				e.printStackTrace();
+				showMessage("Something was wrong: " + e.toString());
 			}
 		});
     }
@@ -369,16 +357,16 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		final File fileToUpload = upFolder.listFiles()[0];
 		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
 
-		if (!validServerAddress()) return;
-
 //		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(URL + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME + remotePath)
 				.addHeader(AUTHORIZATION_HEADER, mCredentials)
 				.addHeader(USER_AGENT_HEADER, USER_AGENT_VALUE)
 				.get()
@@ -391,29 +379,63 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 				if (!response.isSuccessful()) {
 
-					showUnsuccessfulMessage(response.code());
+					showMessage("Response not successful with code: " + response.code());
 
 					throw new IOException("Unexpected code " + response);
 
 				} else { // Successful response
 
-					showSuccessfulMessage("Successful download of " + fileToUpload.getName() + " although local file " +
+					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() {
     	File upFolder = new File(getCacheDir(), getString(R.string.upload_folder_path));
-    	File fileToUpload = upFolder.listFiles()[0]; 
+    	final 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(SERVER_ADDRESS + NEW_WEBDAV_PATH + 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());
+			}
+		});
     }
     
     @SuppressWarnings("deprecation")
@@ -519,17 +541,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		return true;
 	}
 
-	private void showUnsuccessfulMessage (final int errorCode) {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-
-				showToastMessage("Response not successful with code " + String.valueOf(errorCode));
-			}
-		});
-	}
-
-	private void showSuccessfulMessage (final String message) {
+	private void showMessage(final String message) {
 		runOnUiThread(new Runnable() {
 			@Override
 			public void run() {

From d0d26b7a3bbce3fbd75d276aa4eac908aff5e863 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 20 Apr 2018 12:35:06 +0200
Subject: [PATCH 09/25] Fix uploads

---
 .../lib/sampleclient/MainActivity.java        | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 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 43f204fd..481f288b 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -68,7 +68,6 @@ import okhttp3.Callback;
 import okhttp3.Credentials;
 import okhttp3.Headers;
 import okhttp3.MediaType;
-import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -88,16 +87,10 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 	private static final String NODE_VERSION = "version";
 
-	private static final String SERVER_ADDRESS = "TO COMPLETE";
-
 	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 USERNAME = "TO COMPLETE";
-
-	private static final String PASSWORD = "TO COMPLETE";
-
 	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";
@@ -152,11 +145,11 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 			Log.e(LOG_TAG, getString(R.string.error_copying_sample_file), e);
 		}
 
-		((TextView) findViewById(R.id.server_address)).setText(SERVER_ADDRESS);
+		((TextView) findViewById(R.id.server_address)).setText(getString(R.string.server_base_url));
 
 		mOkHttpClient = new OkHttpClient();
 
-		mCredentials = Credentials.basic(USERNAME, PASSWORD);
+		mCredentials = Credentials.basic(getString(R.string.username), getString(R.string.password));
 		
 //		mFrame = findViewById(R.id.frame);
     }
@@ -202,7 +195,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		if (!validServerAddress()) return;
 
 		Request request = new Request.Builder()
-				.url(SERVER_ADDRESS + "/status.php")
+				.url(getString(R.string.server_base_url) + "/status.php")
 				.get()
 				.build();
 
@@ -254,7 +247,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		if (!validServerAddress()) return;
 
 		final Request request = new Request.Builder()
-				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME)
+				.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)
@@ -311,14 +304,10 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
 		if (!validServerAddress()) return;
 
-		RequestBody requestBody = new MultipartBody.Builder()
-				.setType(MultipartBody.FORM)
-				.addFormDataPart("data", fileToUpload.getName(), RequestBody.create(mediaType, fileToUpload))
-                .addFormDataPart("name", fileToUpload.getName())
-				.build();
+		RequestBody requestBody = RequestBody.create(mediaType, fileToUpload);
 
 		final Request request = new Request.Builder()
-				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.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)
@@ -366,7 +355,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		if (!validServerAddress()) return;
 
 		final Request request = new Request.Builder()
-				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.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()
@@ -409,7 +398,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 		if (!validServerAddress()) return;
 
 		final Request request = new Request.Builder()
-				.url(SERVER_ADDRESS + NEW_WEBDAV_PATH + USERNAME + remotePath)
+				.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()

From e6835b1518a742d2a5baa13fdbc2d63f5c195b4d Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 20 Apr 2018 12:40:52 +0200
Subject: [PATCH 10/25] Reorder variables

---
 .../lib/sampleclient/MainActivity.java        | 28 ++++++++-----------
 1 file changed, 12 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 481f288b..e87dbc4c 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -75,7 +75,18 @@ import okhttp3.Response;
 
 public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
 	
-	private static String LOG_TAG = MainActivity.class.getCanonicalName();  
+	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;
 	
@@ -85,21 +96,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	
 	private View mFrame;
 
-	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 OkHttpClient mOkHttpClient;
 
 	private String mCredentials;

From 3bd29307a53037768a35ede653d5a84945997e73 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 25 Apr 2018 11:23:06 +0200
Subject: [PATCH 11/25] Upgrade gradle and fix some conflicts

---
 build.gradle                   | 6 ++++--
 sample_client/build.gradle     | 2 +-
 test_client/build.gradle       | 2 +-
 test_client/tests/build.gradle | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index c97858bf..735703c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
@@ -11,6 +12,7 @@ apply plugin: 'com.android.library'
 
 repositories {
     jcenter()
+    google()
 }
 
 dependencies {
@@ -34,7 +36,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index 2c7a6b08..1be2e8c5 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -24,7 +24,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
diff --git a/test_client/build.gradle b/test_client/build.gradle
index 319d157b..e9a8c6aa 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -26,7 +26,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle
index b9a2b5a1..4b423aab 100644
--- a/test_client/tests/build.gradle
+++ b/test_client/tests/build.gradle
@@ -21,7 +21,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...

From 1ff922af6a785a2128fc154bad4e3d73b6ec5ccb Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 25 Apr 2018 16:38:51 +0200
Subject: [PATCH 12/25] Get rid of some warnings

---
 build.gradle                   | 3 +--
 sample_client/build.gradle     | 3 +--
 test_client/build.gradle       | 5 ++---
 test_client/tests/build.gradle | 5 ++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 735703c9..3043c612 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,12 +17,11 @@ repositories {
 
 dependencies {
     compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
-    compile 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.2'
 
     sourceSets {
         main {
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index 1be2e8c5..c1bd54a1 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -5,12 +5,11 @@ repositories {
 }
 
 dependencies {
-    compile project(':')
+    implementation project(':')
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.2"
 
     sourceSets {
         main {
diff --git a/test_client/build.gradle b/test_client/build.gradle
index e9a8c6aa..c3f020a0 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -6,13 +6,12 @@ repositories {
 }
 
 dependencies {
-    compile 'commons-httpclient:commons-httpclient:3.1'
-    compile project(':')
+    implementation 'commons-httpclient:commons-httpclient:3.1'
+    implementation project(':')
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.2"
 
     sourceSets {
         main {
diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle
index 4b423aab..33b017fb 100644
--- a/test_client/tests/build.gradle
+++ b/test_client/tests/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
-    compile project(':')
+    implementation fileTree(dir: 'libs', include: '*.jar')
+    implementation project(':')
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.2"
 
     sourceSets {
         main {

From b1ef9ec44b14bc092de482b25edc93f569126f96 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 25 Apr 2018 17:18:36 +0200
Subject: [PATCH 13/25] Solve google repository issue

---
 build.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3043c612..fc027e5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,9 @@
 buildscript {
     repositories {
         jcenter()
-        google()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
@@ -12,7 +14,9 @@ apply plugin: 'com.android.library'
 
 repositories {
     jcenter()
-    google()
+    maven {
+        url "https://maven.google.com"
+    }
 }
 
 dependencies {

From 91f509a1196bc903d1bf97c23d8e40889740cf08 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 25 Apr 2018 17:30:53 +0200
Subject: [PATCH 14/25] Fix failed Travis test

---
 build.gradle                             | 8 ++------
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index fc027e5e..3043c612 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,7 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
@@ -14,9 +12,7 @@ apply plugin: 'com.android.library'
 
 repositories {
     jcenter()
-    maven {
-        url "https://maven.google.com"
-    }
+    google()
 }
 
 dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a04cf10f..75622d3e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

From 35ea9dfd202faed7cffb1652c3cbd30f29d46309 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 25 Apr 2018 17:48:17 +0200
Subject: [PATCH 15/25] Fix okHttp not found

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

diff --git a/build.gradle b/build.gradle
index 3043c612..31f4bdc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ repositories {
 
 dependencies {
     compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    compile 'com.squareup.okhttp3:okhttp:3.10.0'
 }
 
 android {

From 9a2fb4cd0a87d1dedc42a801b8f7b07e14ce7e58 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 26 Apr 2018 10:37:08 +0200
Subject: [PATCH 16/25] Fix Could not find
 com.android.tools.lint:lint-gradle:26.1.2.

---
 build.gradle | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 31f4bdc5..15bdd8ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,9 +10,11 @@ buildscript {
 
 apply plugin: 'com.android.library'
 
-repositories {
-    jcenter()
-    google()
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
 }
 
 dependencies {

From 2ccd681d2f4c1147f3d773875c7b4c09e7d3e101 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 30 Apr 2018 10:16:37 +0200
Subject: [PATCH 17/25] Fix merge dex error and delete redundant dependencies

---
 gradle/wrapper/gradle-wrapper.properties               | 2 +-
 sample_client/build.gradle                             | 5 -----
 sample_client/gradle/wrapper/gradle-wrapper.properties | 2 +-
 test_client/build.gradle                               | 6 ------
 test_client/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 75622d3e..267dfc1e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index c1bd54a1..c0f96865 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -42,9 +42,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
 }
diff --git a/sample_client/gradle/wrapper/gradle-wrapper.properties b/sample_client/gradle/wrapper/gradle-wrapper.properties
index 122a0dca..fc5d4423 100644
--- a/sample_client/gradle/wrapper/gradle-wrapper.properties
+++ b/sample_client/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
diff --git a/test_client/build.gradle b/test_client/build.gradle
index c3f020a0..8d01b841 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -6,7 +6,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'commons-httpclient:commons-httpclient:3.1'
     implementation project(':')
 }
 
@@ -44,9 +43,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
 }
diff --git a/test_client/gradle/wrapper/gradle-wrapper.properties b/test_client/gradle/wrapper/gradle-wrapper.properties
index 122a0dca..fc5d4423 100644
--- a/test_client/gradle/wrapper/gradle-wrapper.properties
+++ b/test_client/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file

From bf225b275f36a6d1618d79be9b4eacc7588d3c9d Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 30 Apr 2018 12:50:39 +0200
Subject: [PATCH 18/25] Replace compile with api

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 15bdd8ec..3fe45e41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,8 @@ allprojects {
 }
 
 dependencies {
-    compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
-    compile 'com.squareup.okhttp3:okhttp:3.10.0'
+    api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.4'
+    api 'com.squareup.okhttp3:okhttp:3.10.0'
 }
 
 android {

From 2888b2d55e40ce70048eaefbc0b432d383bde011 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 30 Apr 2018 12:55:03 +0200
Subject: [PATCH 19/25] Update minSdkVersion

---
 AndroidManifest.xml                   | 2 +-
 test_client/AndroidManifest.xml       | 2 +-
 test_client/tests/AndroidManifest.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 36c89370..81b9494e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,7 +34,7 @@
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="14"
         android:targetSdkVersion="26" />
 
 </manifest>
diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml
index 1d7ae35e..14de3eab 100644
--- a/test_client/AndroidManifest.xml
+++ b/test_client/AndroidManifest.xml
@@ -38,7 +38,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
 	<uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="14"
         android:targetSdkVersion="26" />
 
     <application
diff --git a/test_client/tests/AndroidManifest.xml b/test_client/tests/AndroidManifest.xml
index b5aaeb57..92d36c4f 100644
--- a/test_client/tests/AndroidManifest.xml
+++ b/test_client/tests/AndroidManifest.xml
@@ -28,7 +28,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="14" />
     <application>
         <uses-library android:name="android.test.runner" />
     </application>

From 12429b7ab955c872eee561cba0dd0edffd3c983b Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 8 May 2018 12:53:32 +0200
Subject: [PATCH 20/25] Update operation to get remote user quota

---
 .../lib/common/network/WebdavUtils.java       |  11 ++
 .../operations/RemoteOperationResult.java     |   9 +-
 .../files/ReadRemoteFolderOperation.java      |   1 -
 .../users/GetRemoteUserQuotaOperation.java    | 129 ++++++++++--------
 4 files changed, 91 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 8c307b60..1bbf3aa9 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -140,6 +140,17 @@ public class WebdavUtils {
         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 e8699e7d..56722fe5 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.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
@@ -55,11 +55,12 @@ import javax.net.ssl.SSLException;
 
 /**
  * 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
+ * @author David González Verdugo
  */
 public class RemoteOperationResult implements Serializable {
 
@@ -378,8 +379,8 @@ public class RemoteOperationResult implements Serializable {
         }
     }
 
-    public void setData(ArrayList<Object> files) {
-        mData = files;
+    public void setData(ArrayList<Object> items) {
+        mData = items;
     }
 
     public ArrayList<Object> getData() {
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 53b8295f..d6caae8e 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -150,7 +150,6 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
             remoteFile = fillOCFile(we);
             mFolderAndFiles.add(remoteFile);
         }
-
     }
 
     /**
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index a1e64aca..d6e9c4c6 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2018 ownCloud Inc.
  *   Copyright (C) 2015 Bartosz Przybylski
  *   Copyright (C) 2014 Marcello Steiner
  *
@@ -28,20 +28,23 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
+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 org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.json.JSONObject;
+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.util.ArrayList;
 
 /**
  * @author marcello
+ * @author David González Verdugo
  */
 public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
@@ -64,72 +67,66 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
     private static final String TAG = GetRemoteUserQuotaOperation.class.getSimpleName();
 
-    private static final String NODE_OCS = "ocs";
-    private static final String NODE_DATA = "data";
-    private static final String NODE_QUOTA = "quota";
-    private static final String NODE_QUOTA_FREE = "free";
-    private static final String NODE_QUOTA_USED = "used";
-    private static final String NODE_QUOTA_TOTAL = "total";
-    private static final String NODE_QUOTA_RELATIVE = "relative";
+    private String mRemotePath;
 
-    // OCS Route
-    private static final String OCS_ROUTE ="/ocs/v1.php/cloud/users/";
+    /**
+     * Constructor
+     *
+     * @param remotePath Remote path of the file.
+     */
+    public GetRemoteUserQuotaOperation(String remotePath) {
+        mRemotePath = remotePath;
+    }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
-        int status;
-        GetMethod get = null;
+        PropFindMethod query = null;
 
-
-        //Get the user
         try {
-            OwnCloudCredentials credentials = client.getCredentials();
-            String url = client.getBaseUri() + OCS_ROUTE + credentials.getUsername();
+            // remote request
+            query = new PropFindMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath),
+                    WebdavUtils.getQuotaPropSet(),
+                    DavConstants.DEPTH_0);
 
-            get = new GetMethod(url);
-            get.setQueryString(new NameValuePair[]{new NameValuePair("format","json")});
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-            status = client.executeMethod(get);
+            int status = client.executeMethod(query);
 
-            if(isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
+            if (isSuccess(status)) {
+                // get data from remote folder
+                MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
+                Quota quota = readData(dataInServer, client);
 
-                // Parse the response
-                JSONObject respJSON = new JSONObject(response);
-                JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
-                JSONObject respData = respOCS.getJSONObject(NODE_DATA);
-                JSONObject quota    = respData.getJSONObject(NODE_QUOTA);
-                final Long quotaFree = quota.getLong(NODE_QUOTA_FREE);
-                final Long quotaUsed = quota.getLong(NODE_QUOTA_USED);
-                final Long quotaTotal = quota.getLong(NODE_QUOTA_TOTAL);
-                final Double quotaRelative = quota.getDouble(NODE_QUOTA_RELATIVE);
+                // Result of the operation
+                result = new RemoteOperationResult(true, query);
 
+                ArrayList<Object> data = new ArrayList<>();
+                data.add(quota);
 
-                // Result
-                result = new RemoteOperationResult(true, get);
-                //Quota data in data collection
-                ArrayList<Object> data = new ArrayList<Object>();
-                data.add(new Quota(quotaFree, quotaUsed, quotaTotal, quotaRelative));
-                result.setData(data);
-
-            } else {
-                result = new RemoteOperationResult(false, get);
-                String response = get.getResponseBodyAsString();
-                Log_OC.e(TAG, "Failed response while getting user quota information ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-                } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
+                // Add data to the result
+                if (result.isSuccess()) {
+                    result.setData(data);
                 }
+            } else {
+                // synchronization failed
+                result = new RemoteOperationResult(false, query);
             }
+
         } 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 (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 {
+                if (result.isException()) {
+                    Log_OC.e(TAG, "Get quota from " + mRemotePath + ": " + result.getLogMessage(),
+                            result.getException());
+                } else {
+                    Log_OC.e(TAG, "Get quota from " + mRemotePath + ": " + result.getLogMessage());
+                }
             }
         }
 
@@ -137,8 +134,32 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
     }
 
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return status == HttpStatus.SC_MULTI_STATUS || status == HttpStatus.SC_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
+     */
+    private Quota readData(MultiStatus remoteData, OwnCloudClient client) {
 
+        // parse data from remote folder
+        WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getWebdavUri().getPath());
+
+        BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
+
+        BigDecimal relativeQuota = we.quotaUsedBytes().multiply(new BigDecimal(100)).divide(totalQuota);
+
+        Quota quota = new Quota(
+                we.quotaAvailableBytes().longValue(),
+                we.quotaUsedBytes().longValue(),
+                totalQuota.longValue(),
+                relativeQuota.doubleValue()
+        );
+
+        return quota;
+    }
 }

From ec08bfbd7acc7a170eaeaf593fcdc1ced4875002 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 8 May 2018 13:16:07 +0200
Subject: [PATCH 21/25] Fix get quota test

---
 .../owncloud/android/lib/test_project/TestActivity.java   | 7 ++++---
 .../android/lib/test_project/test/GetUserQuotaTest.java   | 8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

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 9b9ecc3d..46beb44e 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,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
@@ -65,6 +65,7 @@ import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation;
  * Activity to test OC framework
  * @author masensio
  * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class TestActivity extends Activity {
@@ -338,8 +339,8 @@ public class TestActivity extends Activity {
 		
 	}
 
-    public RemoteOperationResult getQuota() {
-        GetRemoteUserQuotaOperation getUserQuotaOperation = new GetRemoteUserQuotaOperation();
+    public RemoteOperationResult getQuota(String remotePath) {
+        GetRemoteUserQuotaOperation getUserQuotaOperation = new GetRemoteUserQuotaOperation(remotePath);
         return getUserQuotaOperation.execute(mClient);
     }
 
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserQuotaTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserQuotaTest.java
index b18c90a5..8d4f41a8 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserQuotaTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserQuotaTest.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2018 ownCloud Inc.
  *   Copyright (C) 2015 Bartosz Przybylski
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -38,6 +38,7 @@ import com.owncloud.android.lib.test_project.TestActivity;
  *
  * @author Bartosz Przybylski
  * @author David A. Velasco
+ * @author David González Verdugo
  */
 public class GetUserQuotaTest extends RemoteTest {
 
@@ -45,6 +46,8 @@ public class GetUserQuotaTest extends RemoteTest {
     private static final String LOG_TAG = GetUserQuotaTest.class.getCanonicalName();
 
     private TestActivity mActivity;
+    private String mFullPath2Root;
+    private String ROOT_PATH = "/";
 
 
     @Override
@@ -52,13 +55,14 @@ public class GetUserQuotaTest extends RemoteTest {
         super.setUp();
         setActivityInitialTouchMode(false);
         mActivity = getActivity();
+        mFullPath2Root = mBaseFolderPath + ROOT_PATH;
     }
 
     /**
      * Test GetUserQuota
      */
     public void testGetUserQuota() {
-        RemoteOperationResult result = mActivity.getQuota();
+        RemoteOperationResult result = mActivity.getQuota(mFullPath2Root);
         assertTrue(result.isSuccess());
         Quota quota = (Quota)((ArrayList<Object>)result.getData()).get(0);
         assertTrue(quota.getFree() >= 0);

From a21614fd5a1e48644d00402e539464fbbaa3d1df Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 8 May 2018 17:13:37 +0200
Subject: [PATCH 22/25] Handle pending, unknown and unlimited quota

---
 .../users/GetRemoteUserQuotaOperation.java    | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index d6e9c4c6..69e775aa 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -49,6 +49,16 @@ import java.util.ArrayList;
 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;
+
         long mFree, mUsed, mTotal;
         double mRelative;
 
@@ -149,17 +159,30 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
         // parse data from remote folder
         WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getWebdavUri().getPath());
 
-        BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
+        // If there's a special case, available bytes will contain a negative code
+        if (we.quotaAvailableBytes().compareTo(new BigDecimal(0)) == -1) {
 
-        BigDecimal relativeQuota = we.quotaUsedBytes().multiply(new BigDecimal(100)).divide(totalQuota);
+            return new Quota(
+                    we.quotaAvailableBytes().longValue(),
+                    we.quotaUsedBytes().longValue(),
+                    0,
+                    0
+            );
 
-        Quota quota = new Quota(
-                we.quotaAvailableBytes().longValue(),
-                we.quotaUsedBytes().longValue(),
-                totalQuota.longValue(),
-                relativeQuota.doubleValue()
-        );
+        } else {
 
-        return quota;
+            BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
+
+            BigDecimal relativeQuota = we.quotaUsedBytes()
+                    .multiply(new BigDecimal(100))
+                    .divide(totalQuota);
+
+            return new Quota(
+                    we.quotaAvailableBytes().longValue(),
+                    we.quotaUsedBytes().longValue(),
+                    totalQuota.longValue(),
+                    relativeQuota.doubleValue()
+            );
+        }
     }
 }

From f3566d667e6f949d35b7fd91240a28d130b22675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <dgonzalez@solidgear.es>
Date: Tue, 15 May 2018 13:07:44 +0200
Subject: [PATCH 23/25] Handle case with quota 0

---
 .../users/GetRemoteUserQuotaOperation.java    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 69e775aa..849784ed 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -160,8 +160,10 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
         WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getWebdavUri().getPath());
 
         // If there's a special case, available bytes will contain a negative code
-        if (we.quotaAvailableBytes().compareTo(new BigDecimal(0)) == -1) {
-
+        // -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(),
@@ -171,18 +173,18 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
         } else {
 
-            BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
+                BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
 
-            BigDecimal relativeQuota = we.quotaUsedBytes()
-                    .multiply(new BigDecimal(100))
-                    .divide(totalQuota);
+                BigDecimal relativeQuota = we.quotaUsedBytes()
+                        .multiply(new BigDecimal(100))
+                        .divide(totalQuota);
 
-            return new Quota(
-                    we.quotaAvailableBytes().longValue(),
-                    we.quotaUsedBytes().longValue(),
-                    totalQuota.longValue(),
-                    relativeQuota.doubleValue()
-            );
+                return new Quota(
+                        we.quotaAvailableBytes().longValue(),
+                        we.quotaUsedBytes().longValue(),
+                        totalQuota.longValue(),
+                        relativeQuota.doubleValue()
+                );
         }
     }
 }

From fdbe23923ef047b0e527d1d9df682b5fc15af61a Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Wed, 16 May 2018 17:47:12 +0200
Subject: [PATCH 24/25] Fix Incorrect output with Other option

---
 .../users/GetRemoteUserQuotaOperation.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
index 849784ed..2109efb4 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java
@@ -40,6 +40,7 @@ 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;
 
 /**
@@ -173,18 +174,18 @@ public class GetRemoteUserQuotaOperation extends RemoteOperation {
 
         } else {
 
-                BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
+            BigDecimal totalQuota = we.quotaAvailableBytes().add(we.quotaUsedBytes());
 
-                BigDecimal relativeQuota = we.quotaUsedBytes()
-                        .multiply(new BigDecimal(100))
-                        .divide(totalQuota);
+            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 Quota(
+                    we.quotaAvailableBytes().longValue(),
+                    we.quotaUsedBytes().longValue(),
+                    totalQuota.longValue(),
+                    relativeQuota.doubleValue()
+            );
         }
     }
 }

From 813900d60095d0fe9ad886e94343165652daacfb Mon Sep 17 00:00:00 2001
From: Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
Date: Tue, 22 May 2018 16:26:48 +0300
Subject: [PATCH 25/25] check for PROPERTY_VERSIONING is exist when learning
 capabilities

---
 .../resources/status/GetRemoteCapabilitiesOperation.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 3f87e5cc..a3c77e26 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -1,6 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   @author Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
+ *   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
@@ -245,8 +246,10 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
                                 capability.setFilesUndelete(CapabilityBooleanType.fromBooleanValue(
                                         respFiles.getBoolean(PROPERTY_UNDELETE)));
                             }
-                            capability.setFilesVersioning(CapabilityBooleanType.fromBooleanValue(
-                                    respFiles.getBoolean(PROPERTY_VERSIONING)));
+                            if (respFiles.has(PROPERTY_VERSIONING)) {
+                                capability.setFilesVersioning(CapabilityBooleanType.fromBooleanValue(
+                                        respFiles.getBoolean(PROPERTY_VERSIONING)));
+                            }
                             Log_OC.d(TAG, "*** Added " + NODE_FILES);
                         }
                     }