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 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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;