X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5282400a10af6db98708ded2cad9d1c2046fee6e..ff0803c3eead5a8b42b9a6f3fc4d351be076c081:/src/eu/alefzero/webdav/WebdavClient.java diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 797bad4d..a5398000 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -21,11 +21,13 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.HashMap; import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.HttpClient; 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; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.methods.GetMethod; @@ -34,21 +36,21 @@ import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.protocol.Protocol; import org.apache.http.HttpStatus; +import org.apache.http.params.CoreProtocolPNames; import org.apache.jackrabbit.webdav.client.methods.DavMethod; import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; import org.apache.jackrabbit.webdav.client.methods.MkColMethod; -import eu.alefzero.owncloud.AccountUtils; -import eu.alefzero.owncloud.authenticator.AccountAuthenticator; -import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory; -import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener; -import eu.alefzero.owncloud.utils.OwnCloudVersion; - import android.accounts.Account; import android.accounts.AccountManager; import android.content.Context; import android.net.Uri; import android.util.Log; +import eu.alefzero.owncloud.AccountUtils; +import eu.alefzero.owncloud.authenticator.AccountAuthenticator; +import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory; +import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener; +import eu.alefzero.owncloud.utils.OwnCloudVersion; public class WebdavClient extends HttpClient { private Uri mUri; @@ -56,33 +58,42 @@ public class WebdavClient extends HttpClient { final private static String TAG = "WebdavClient"; private static final String USER_AGENT = "Android-ownCloud"; private OnDatatransferProgressListener mDataTransferListener; - private static HashMap clients = new HashMap(); + static private MultiThreadedHttpConnectionManager mConnManager = null; + + static public MultiThreadedHttpConnectionManager getMultiThreadedConnManager() { + if (mConnManager == null) { + mConnManager = new MultiThreadedHttpConnectionManager(); + mConnManager.setMaxConnectionsPerHost(5); + mConnManager.setMaxTotalConnections(5); + } + return mConnManager; + } /** - * Gets a WebdavClient setup for the current account + * Creates a WebdavClient setup for the current account * @param account The client accout * @param context The application context * @return */ - public static synchronized WebdavClient getInstance(Account account, Context context){ - WebdavClient instance = clients.get(account.name); - if(instance == null ){ - 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); - WebdavClient client = new WebdavClient(); - - String username = account.name.substring(0, account.name.indexOf('@')); - String password = AccountManager.get(context).getPassword(account); - - client.mUri = Uri.parse(baseUrl + webDavPath); - client.getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT); - client.setCredentials(username, password); - client.allowSelfsignedCertificates(); - clients.put(account.name, client); - } - return instance; + public WebdavClient (Account account, Context context) { + 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 password = AccountManager.get(context).getPassword(account); + + mUri = Uri.parse(baseUrl + webDavPath); + + setCredentials(username, password); + } + + public WebdavClient() { + super(getMultiThreadedConnManager()); + + getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT); + getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1); + allowSelfsignedCertificates(); } public void setCredentials(String username, String password) { @@ -103,62 +114,58 @@ 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) { - // HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ", - // "%20")); - /* dvelasco - this is not necessary anymore; OCFile.mRemotePath (the origin of remoteFielPath) keeps valid URL strings - String[] splitted_filepath = remoteFilepath.split("/"); - remoteFilepath = ""; - for (String s : splitted_filepath) { - if (s.equals("")) continue; - remoteFilepath += "/" + URLEncoder.encode(s); - } - - Log.e("ASD", mUri.toString() + remoteFilepath.replace(" ", "%20") + ""); - GetMethod get = new GetMethod(mUri.toString() - + remoteFilepath.replace(" ", "%20")); - */ - GetMethod get = new GetMethod(mUri.toString() + remoteFilepath); + 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 (IOException e) { - Log.e(TAG, "Logging failed with error: " + e.getMessage(), e); + } catch (Throwable e) { + Log.e(TAG, "Deleting failed with error: " + e.getMessage(), e); return false; } return true; @@ -168,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; @@ -178,10 +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); + 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"); @@ -200,21 +216,28 @@ public class WebdavClient extends HttpClient { * @param password Password to verify * @return A {@link HttpStatus}-Code of the result. SC_OK is good. */ - public int tryToLogin(Uri uri, String username, String password) { + public static int tryToLogin(Uri uri, String username, String password) { int returnCode = 0; - setCredentials(username, password); + WebdavClient client = new WebdavClient(); + client.setCredentials(username, password); HeadMethod head = new HeadMethod(uri.toString()); try { - returnCode = executeMethod(head); + returnCode = client.executeMethod(head); } catch (Exception e) { Log.e(TAG, "Error: " + e.getMessage()); } 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()); @@ -225,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); + } + } }