Adding cancellation to uploads (WIP)

[pub/Android/ownCloud.git] / src / com / owncloud / android / authenticator / AuthenticationRunnable.java

diff --git a/src/com/owncloud/android/authenticator/AuthenticationRunnable.java b/src/com/owncloud/android/authenticator/AuthenticationRunnable.java
index dba3281..ac547f8 100644 (file)
--- a/src/com/owncloud/android/authenticator/AuthenticationRunnable.java
+++ b/src/com/owncloud/android/authenticator/AuthenticationRunnable.java
@@ -22,8 +22,11 @@ import java.net.URL;
 
 import org.apache.commons.httpclient.HttpStatus;
 
 
 import org.apache.commons.httpclient.HttpStatus;
 

+import com.owncloud.android.network.OwnCloudClientUtils;
+

 import eu.alefzero.webdav.WebdavClient;
 
 import eu.alefzero.webdav.WebdavClient;
 

+import android.content.Context;

 import android.net.Uri;
 import android.os.Handler;
 
 import android.net.Uri;
 import android.os.Handler;
 


@@ -34,12 +37,14 @@ public class AuthenticationRunnable implements Runnable {
     private URL mUrl;
     private String mUsername;
     private String mPassword;
     private URL mUrl;
     private String mUsername;
     private String mPassword;

+    private Context mContext;

 
 

-    public AuthenticationRunnable(URL url, String username, String password) {
+    public AuthenticationRunnable(URL url, String username, String password, Context context) {

         mListener = null;
         mUrl = url;
         mUsername = username;
         mPassword = password;
         mListener = null;
         mUrl = url;
         mUsername = username;
         mPassword = password;

+        mContext = context;

     }
 
     public void setOnAuthenticationResultListener(
     }
 
     public void setOnAuthenticationResultListener(


@@ -52,7 +57,8 @@ public class AuthenticationRunnable implements Runnable {
     public void run() {
         Uri uri;
         uri = Uri.parse(mUrl.toString());
     public void run() {
         Uri uri;
         uri = Uri.parse(mUrl.toString());

-        int login_result = WebdavClient.tryToLogin(uri, mUsername, mPassword);
+        WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(uri, mUsername, mPassword, mContext);
+        int login_result = wdc.tryToLogin();

         switch (login_result) {
         case HttpStatus.SC_OK:
             postResult(true, uri.toString());
         switch (login_result) {
         case HttpStatus.SC_OK:
             postResult(true, uri.toString());