X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0aeb425885ceccb28b31c9822d52b90656bf9257..b2b6bdeadf069856bc7a67d6774985a799ab55fc:/src/eu/alefzero/webdav/WebdavClient.java diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 880995da..4b719fb6 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.net.URLDecoder; +import java.net.URLEncoder; import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.HttpClient; @@ -30,6 +31,7 @@ import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.HeadMethod; import org.apache.commons.httpclient.methods.PutMethod; +import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.protocol.Protocol; import org.apache.http.HttpStatus; @@ -71,12 +73,13 @@ public class WebdavClient extends HttpClient { //HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ", "%20")); Log.e("ASD", mUri.toString() + URLDecoder.decode(filepath) + ""); - GetMethod get = new GetMethod(mUri.toString() + URLDecoder.decode(filepath)); + GetMethod get = new GetMethod(mUri.toString() + URLEncoder.encode(filepath)); // get.setHeader("Host", mUri.getHost()); // get.setHeader("User-Agent", "Android-ownCloud"); - try { + try { + Log.e("ASD", get.toString()); int status = executeMethod(get); if (status != HttpStatus.SC_OK) { return false; @@ -100,10 +103,14 @@ public class WebdavClient extends HttpClient { String contentType) { boolean result = true; - try { - FileRequestEntity entity = new FileRequestEntity(new File(localFile), contentType); - PutMethod put = new PutMethod(mUri.toString() + remoteTarget.substring(1)); + try { + Log.e("ASD", contentType+""); + File f = new File(localFile); + RequestEntity entity = new FileRequestEntity(f, contentType); + Log.e("ASD", f.exists()+" " + entity.getContentLength()); + PutMethod put = new PutMethod(mUri.toString() + remoteTarget); put.setRequestEntity(entity); + Log.d(TAG, "" + put.getURI().toString()); int status = executeMethod(put); Log.d(TAG, "PUT method return with status "+status);