X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5282400a10af6db98708ded2cad9d1c2046fee6e..43da474a54718e5cfcd8be06c0aaa5b81b80699e:/src/eu/alefzero/webdav/WebdavClient.java?ds=sidebyside

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 797bad4d..a1dbd098 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -25,7 +25,6 @@ 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.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -38,17 +37,16 @@ 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;
@@ -59,31 +57,26 @@ public class WebdavClient extends HttpClient {
     private static HashMap<String, WebdavClient> clients = new HashMap<String, WebdavClient>();
     
     /**
-     * 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);
+        getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
+        setCredentials(username, password);
+        allowSelfsignedCertificates();
     }
+    
+    public WebdavClient(){}
 
     public void setCredentials(String username, String password) {
         getParams().setAuthenticationPreemptive(true);
@@ -157,8 +150,8 @@ public class WebdavClient extends HttpClient {
         DavMethod delete = new DeleteMethod(mUri.toString() + 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;
@@ -200,12 +193,13 @@ 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());
         }