X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3113c459092dbb3dea60e50efe61070e38804b09..ff0803c3eead5a8b42b9a6f3fc4d351be076c081:/src/eu/alefzero/webdav/WebdavClient.java diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 8d2934c1..a5398000 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -24,7 +24,8 @@ import java.io.IOException; import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpConnectionManager; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.HttpMethodBase; import org.apache.commons.httpclient.HttpVersion; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.UsernamePasswordCredentials; @@ -96,7 +97,7 @@ public class WebdavClient extends HttpClient { } public void setCredentials(String username, String password) { - //getParams().setAuthenticationPreemptive(true); + getParams().setAuthenticationPreemptive(true); getState().setCredentials(AuthScope.ANY, getCredentials(username, password)); } @@ -113,47 +114,54 @@ public class WebdavClient extends HttpClient { new EasySSLSocketFactory(), 443)); } + /** + * Downloads a file in remoteFilepath to the local targetPath. + * + * @param remoteFilepath Path to the file in the remote server, URL DECODED. + * @param targetPath Local path to save the downloaded file. + * @return 'True' when the file is successfully downloaded. + */ public boolean downloadFile(String remoteFilepath, File targetPath) { - GetMethod get = new GetMethod(mUri.toString() + remoteFilepath); - HttpMethodParams params = get.getParams(); - params.setSoTimeout(0); // that means "infinite timeout"; it's the default value, but let's make it explicit - get.setParams(params); + boolean ret = false; + GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath)); // get.setHeader("Host", mUri.getHost()); // get.setHeader("User-Agent", "Android-ownCloud"); try { - int status = executeMethod(get); + int status = executeMethod(get, 0); Log.e(TAG, "status return: " + status); - if (status != HttpStatus.SC_OK) { - return false; - } - BufferedInputStream bis = new BufferedInputStream( - get.getResponseBodyAsStream()); - FileOutputStream fos = new FileOutputStream(targetPath); - - byte[] bytes = new byte[4096]; - int readResult; - while ((readResult = bis.read(bytes)) != -1) { - if (mDataTransferListener != null) - mDataTransferListener.transferProgress(readResult); - fos.write(bytes, 0, readResult); - } + if (status == HttpStatus.SC_OK) { + targetPath.createNewFile(); + BufferedInputStream bis = new BufferedInputStream( + get.getResponseBodyAsStream()); + FileOutputStream fos = new FileOutputStream(targetPath); - } catch (IOException e) { + byte[] bytes = new byte[4096]; + int readResult; + while ((readResult = bis.read(bytes)) != -1) { + if (mDataTransferListener != null) + mDataTransferListener.transferProgress(readResult); + fos.write(bytes, 0, readResult); + } + ret = true; + } + + } catch (Throwable e) { e.printStackTrace(); - return false; + targetPath.delete(); } - return true; + + return ret; } /** * Deletes a remote file via webdav - * @param remoteFilePath + * @param remoteFilePath Remote file path of the file to delete, in URL DECODED format. * @return */ public boolean deleteFile(String remoteFilePath){ - DavMethod delete = new DeleteMethod(mUri.toString() + remoteFilePath); + DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilePath)); try { executeMethod(delete); } catch (Throwable e) { @@ -167,6 +175,15 @@ public class WebdavClient extends HttpClient { mDataTransferListener = listener; } + /** + * Creates or update a file in the remote server with the contents of a local file. + * + * + * @param localFile Path to the local file to upload. + * @param remoteTarget Remote path to the file to create or update, URL DECODED + * @param contentType MIME type of the file. + * @return 'True' then the upload was successfully completed + */ public boolean putFile(String localFile, String remoteTarget, String contentType) { boolean result = true; @@ -177,13 +194,10 @@ public class WebdavClient extends HttpClient { FileRequestEntity entity = new FileRequestEntity(f, contentType); entity.setOnDatatransferProgressListener(mDataTransferListener); Log.e("ASD", f.exists() + " " + entity.getContentLength()); - PutMethod put = new PutMethod(mUri.toString() + remoteTarget); - HttpMethodParams params = put.getParams(); - params.setSoTimeout(0); // that means "infinite timeout"; it's the default value, but let's make it explicit - put.setParams(params); + PutMethod put = new PutMethod(mUri.toString() + WebdavUtils.encodePath(remoteTarget)); put.setRequestEntity(entity); Log.d(TAG, "" + put.getURI().toString()); - int status = executeMethod(put); + int status = executeMethod(put, 0); Log.d(TAG, "PUT method return with status " + status); Log.i(TAG, "Uploading, done"); @@ -215,9 +229,15 @@ public class WebdavClient extends HttpClient { return returnCode; } + /** + * Creates a remote directory with the received path. + * + * @param path Path of the directory to create, URL DECODED + * @return 'True' when the directory is successfully created + */ public boolean createDirectory(String path) { try { - MkColMethod mkcol = new MkColMethod(mUri.toString() + path); + MkColMethod mkcol = new MkColMethod(mUri.toString() + WebdavUtils.encodePath(path)); int status = executeMethod(mkcol); Log.d(TAG, "Status returned " + status); Log.d(TAG, "uri: " + mkcol.getURI().toString()); @@ -228,4 +248,31 @@ public class WebdavClient extends HttpClient { } return true; } + + + /** + * Requests the received method with the received timeout (milliseconds). + * + * Executes the method through the inherited HttpClient.executedMethod(method). + * + * Sets the socket timeout for the HttpMethodBase method received. + * + * @param method HTTP method request. + * @param timeout Timeout to set, in milliseconds; <= 0 means infinite. + */ + public int executeMethod(HttpMethodBase method, int readTimeout) throws HttpException, IOException { + int oldSoTimeout = getParams().getSoTimeout(); + try { + if (readTimeout < 0) { + readTimeout = 0; + } + HttpMethodParams params = method.getParams(); + params.setSoTimeout(readTimeout); + method.setParams(params); // this should be enough... + getParams().setSoTimeout(readTimeout); // ... but this is necessary for HTTPS + return executeMethod(method); + } finally { + getParams().setSoTimeout(oldSoTimeout); + } + } }