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