X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d8e4a87c421840ff6f1b46e1441f88921347a181..43da474a54718e5cfcd8be06c0aaa5b81b80699e:/src/eu/alefzero/webdav/WebdavClient.java
diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 1416d17b..a1dbd098 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -15,15 +15,14 @@
* along with this program. If not, see .
*
*/
-package eu.alefzero.webdav;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
+package eu.alefzero.webdav;
+
+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.UsernamePasswordCredentials;
@@ -32,114 +31,192 @@ 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.params.HttpMethodParams;
-import org.apache.commons.httpclient.protocol.Protocol;
+import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.http.HttpStatus;
+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.authenticator.EasySSLSocketFactory;
-
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Context;
import android.net.Uri;
-import android.util.Log;
-
-public class WebdavClient extends HttpClient {
- private Uri mUri;
- private Credentials mCredentials;
- final private static String TAG = "WebdavClient";
- private static final String USER_AGENT = "Android-ownCloud";
-
- public WebdavClient(Uri uri) {
- mUri = uri;
- getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
- }
-
- public void setCredentials(String username, String password) {
- getParams().setAuthenticationPreemptive(true);
- getState().setCredentials(AuthScope.ANY, getCredentials(username, password));
- }
-
- private Credentials getCredentials(String username, String password) {
- if (mCredentials == null)
- mCredentials = new UsernamePasswordCredentials(username, password);
- return mCredentials;
- }
-
- public void allowUnsignedCertificates() {
- // https
- Protocol.registerProtocol("https", new Protocol("https", new EasySSLSocketFactory(), 443));
- }
-
- public boolean downloadFile(String filepath, File targetPath) {
- //HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ", "%20"));
-
- Log.e("ASD", 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 {
- Log.e("ASD", get.toString());
- int status = executeMethod(get);
- if (status != HttpStatus.SC_OK) {
- return false;
- }
- BufferedInputStream bis = new BufferedInputStream(get.getResponseBodyAsStream());
- FileOutputStream fos = new FileOutputStream(targetPath);
-
- byte[] bytes = new byte[512];
- int readResult;
- while ((readResult = bis.read(bytes)) != -1) fos.write(bytes, 0, readResult);
-
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- public boolean putFile(String localFile,
- String remoteTarget,
- String contentType) {
- boolean result = true;
-
- try {
- FileRequestEntity entity = new FileRequestEntity(new File(localFile), contentType);
- PutMethod put = new PutMethod(mUri.toString() + remoteTarget.substring(1));
- put.setRequestEntity(entity);
- int status = executeMethod(put);
- Log.d(TAG, "PUT method return with status "+status);
-
- Log.i(TAG, "Uploading, done");
- } catch (final Exception e) {
- Log.i(TAG, ""+e.getMessage());
- result = false;
- }
-
- return result;
- }
-
- public int tryToLogin() {
- int r = 0;
- HeadMethod head = new HeadMethod(mUri.toString());
- try {
- r = executeMethod(head);
- } catch (Exception e) {
- Log.e(TAG, "Error: " + e.getMessage());
+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;
+ private Credentials mCredentials;
+ final private static String TAG = "WebdavClient";
+ private static final String USER_AGENT = "Android-ownCloud";
+ private OnDatatransferProgressListener mDataTransferListener;
+ private static HashMap clients = new HashMap();
+
+ /**
+ * Creates a WebdavClient setup for the current account
+ * @param account The client accout
+ * @param context The application context
+ * @return
+ */
+ 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);
+ getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
+ setCredentials(username, password);
+ allowSelfsignedCertificates();
+ }
+
+ public WebdavClient(){}
+
+ public void setCredentials(String username, String password) {
+ getParams().setAuthenticationPreemptive(true);
+ getState().setCredentials(AuthScope.ANY,
+ getCredentials(username, password));
+ }
+
+ private Credentials getCredentials(String username, String password) {
+ if (mCredentials == null)
+ mCredentials = new UsernamePasswordCredentials(username, password);
+ return mCredentials;
+ }
+
+ public void allowSelfsignedCertificates() {
+ // https
+ Protocol.registerProtocol("https", new Protocol("https",
+ new EasySSLSocketFactory(), 443));
+ }
+
+ 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);
+
+ // get.setHeader("Host", mUri.getHost());
+ // get.setHeader("User-Agent", "Android-ownCloud");
+
+ try {
+ int status = executeMethod(get);
+ 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);
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Deletes a remote file via webdav
+ * @param remoteFilePath
+ * @return
+ */
+ public boolean deleteFile(String remoteFilePath){
+ DavMethod delete = new DeleteMethod(mUri.toString() + remoteFilePath);
+ try {
+ executeMethod(delete);
+ } catch (Throwable e) {
+ Log.e(TAG, "Deleting failed with error: " + e.getMessage(), e);
+ return false;
+ }
+ return true;
+ }
+
+ public void setDataTransferProgressListener(OnDatatransferProgressListener listener) {
+ mDataTransferListener = listener;
+ }
+
+ public boolean putFile(String localFile, String remoteTarget,
+ String contentType) {
+ boolean result = true;
+
+ try {
+ Log.e("ASD", contentType + "");
+ File f = new File(localFile);
+ FileRequestEntity entity = new FileRequestEntity(f, contentType);
+ entity.setOnDatatransferProgressListener(mDataTransferListener);
+ 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);
+
+ Log.i(TAG, "Uploading, done");
+ } catch (final Exception e) {
+ Log.i(TAG, "" + e.getMessage());
+ result = false;
+ }
+
+ return result;
+ }
+
+ /**
+ * Tries to log in to the given WedDavURI, with the given credentials
+ * @param uri To test
+ * @param username Username to check
+ * @param password Password to verify
+ * @return A {@link HttpStatus}-Code of the result. SC_OK is good.
+ */
+ public static int tryToLogin(Uri uri, String username, String password) {
+ int returnCode = 0;
+ WebdavClient client = new WebdavClient();
+ client.setCredentials(username, password);
+ HeadMethod head = new HeadMethod(uri.toString());
+ try {
+ returnCode = client.executeMethod(head);
+ } catch (Exception e) {
+ Log.e(TAG, "Error: " + e.getMessage());
+ }
+ return returnCode;
+ }
+
+ public boolean createDirectory(String path) {
+ try {
+ MkColMethod mkcol = new MkColMethod(mUri.toString() + path);
+ int status = executeMethod(mkcol);
+ Log.d(TAG, "Status returned " + status);
+ Log.d(TAG, "uri: " + mkcol.getURI().toString());
+ Log.i(TAG, "Creating dir completed");
+ } catch (final Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
}
- return r;
- }
-
- public boolean createDirectory(String path) {
- try {
- MkColMethod mkcol = new MkColMethod(mUri.toString() + "/" + path + "/");
- int status = executeMethod(mkcol);
- Log.d(TAG, "Status returned " + status);
- Log.d(TAG, "uri: " + mkcol.getURI().toString());
- Log.i(TAG, "Creating dir completed");
- } catch (final Exception e) {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-}
+}