X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c6b553f635c7cbb4f21d41a6fa82e204447c16cf..a032bdeebc51a6e81d1bd5c558944f96fc55eacb:/src/eu/alefzero/webdav/WebdavClient.java diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 9eafddc1..503685a1 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; @@ -56,6 +57,13 @@ public class WebdavClient extends HttpClient { private Credentials mCredentials; final private static String TAG = "WebdavClient"; private static final String USER_AGENT = "Android-ownCloud"; + + /** Default timeout for waiting data from the server: 10 seconds */ + public static final int DEFAULT_DATA_TIMEOUT = 10000; + + /** Default timeout for establishing a connection: infinite */ + public static final int DEFAULT_CONNECTION_TIMEOUT = 0; + private OnDatatransferProgressListener mDataTransferListener; static private MultiThreadedHttpConnectionManager mConnManager = null; @@ -75,28 +83,32 @@ public class WebdavClient extends HttpClient { * @return */ public WebdavClient (Account account, Context context) { + setDefaultTimeouts(); + OwnCloudVersion ownCloudVersion = new OwnCloudVersion(AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_VERSION)); String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL); String webDavPath = AccountUtils.getWebdavPath(ownCloudVersion); - String username = account.name.substring(0, account.name.indexOf('@')); + String username = account.name.substring(0, account.name.lastIndexOf('@')); String password = AccountManager.get(context).getPassword(account); mUri = Uri.parse(baseUrl + webDavPath); - + Log.e("ASD", ""+username); setCredentials(username, password); } public WebdavClient() { super(getMultiThreadedConnManager()); + setDefaultTimeouts(); + getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT); getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1); allowSelfsignedCertificates(); } public void setCredentials(String username, String password) { - //getParams().setAuthenticationPreemptive(true); + getParams().setAuthenticationPreemptive(true); getState().setCredentials(AuthScope.ANY, getCredentials(username, password)); } @@ -106,6 +118,14 @@ public class WebdavClient extends HttpClient { mCredentials = new UsernamePasswordCredentials(username, password); return mCredentials; } + + /** + * Sets the connection and wait-for-data timeouts to be applied by default. + */ + private void setDefaultTimeouts() { + getParams().setSoTimeout(DEFAULT_DATA_TIMEOUT); + getHttpConnectionManager().getParams().setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT); + } public void allowSelfsignedCertificates() { // https @@ -117,27 +137,25 @@ public class WebdavClient extends HttpClient { * 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. + * @param targetFile Local path to save the downloaded file. * @return 'True' when the file is successfully downloaded. */ - public boolean downloadFile(String remoteFilepath, File targetPath) { + public boolean downloadFile(String remoteFilepath, File targetFile) { boolean ret = false; - GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encode(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 caughtException = false; + GetMethod get = new GetMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilepath)); // get.setHeader("Host", mUri.getHost()); // get.setHeader("User-Agent", "Android-ownCloud"); + int status = -1; try { - int status = executeMethod(get); - Log.e(TAG, "status return: " + status); + status = executeMethod(get); if (status == HttpStatus.SC_OK) { - targetPath.createNewFile(); + targetFile.createNewFile(); BufferedInputStream bis = new BufferedInputStream( get.getResponseBodyAsStream()); - FileOutputStream fos = new FileOutputStream(targetPath); + FileOutputStream fos = new FileOutputStream(targetFile); byte[] bytes = new byte[4096]; int readResult; @@ -146,14 +164,31 @@ public class WebdavClient extends HttpClient { mDataTransferListener.transferProgress(readResult); fos.write(bytes, 0, readResult); } - + ret = true; + } + + } catch (HttpException e) { + Log.e(TAG, "HTTP exception downloading " + remoteFilepath, e); + caughtException = true; + + } catch (IOException e) { + Log.e(TAG, "I/O exception downloading " + remoteFilepath, e); + caughtException = true; + + } catch (Exception e) { + Log.e(TAG, "Unexpected exception downloading " + remoteFilepath, e); + caughtException = true; + + } finally { + if (!ret) { + if (!caughtException) { + Log.e(TAG, "Download of " + remoteFilepath + " to " + targetFile + " failed with HTTP status " + status); + } + if (targetFile.exists()) { + targetFile.delete(); + } } - ret = true; - } catch (Throwable e) { - e.printStackTrace(); - targetPath.delete(); } - return ret; } @@ -163,7 +198,7 @@ public class WebdavClient extends HttpClient { * @return */ public boolean deleteFile(String remoteFilePath){ - DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encode(remoteFilePath)); + DavMethod delete = new DeleteMethod(mUri.toString() + WebdavUtils.encodePath(remoteFilePath)); try { executeMethod(delete); } catch (Throwable e) { @@ -188,7 +223,7 @@ public class WebdavClient extends HttpClient { */ public boolean putFile(String localFile, String remoteTarget, String contentType) { - boolean result = true; + boolean result = false; try { Log.e("ASD", contentType + ""); @@ -196,16 +231,17 @@ 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() + WebdavUtils.encode(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"); + if (status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT) { + result = true; + Log.i(TAG, "Uploading, done"); + } + } catch (final Exception e) { Log.i(TAG, "" + e.getMessage()); result = false; @@ -228,8 +264,12 @@ public class WebdavClient extends HttpClient { HeadMethod head = new HeadMethod(uri.toString()); try { returnCode = client.executeMethod(head); + } catch (HttpException e) { + Log.e(TAG, "HTTP exception trying to login at " + uri.getEncodedPath(), e); + } catch (IOException e) { + Log.e(TAG, "I/O exception trying to login at " + uri.getEncodedPath(), e); } catch (Exception e) { - Log.e(TAG, "Error: " + e.getMessage()); + Log.e(TAG, "Unexpected exception trying to login at " + uri.getEncodedPath(), e); } return returnCode; } @@ -242,7 +282,7 @@ public class WebdavClient extends HttpClient { */ public boolean createDirectory(String path) { try { - MkColMethod mkcol = new MkColMethod(mUri.toString() + WebdavUtils.encode(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()); @@ -253,4 +293,48 @@ public class WebdavClient extends HttpClient { } return true; } + + + /** + * Check if a file exists in the OC server + * + * @return 'Boolean.TRUE' if the file exists; 'Boolean.FALSE' it doesn't exist; NULL if couldn't be checked + */ + public Boolean existsFile(String path) { + try { + HeadMethod head = new HeadMethod(mUri.toString() + WebdavUtils.encodePath(path)); + int status = executeMethod(head); + return (status == HttpStatus.SC_OK); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + + /** + * 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); + } + } }