adjusting design to holo, stability for account setup

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / authenticator / AuthenticationRunnable.java

diff --git a/src/eu/alefzero/owncloud/authenticator/AuthenticationRunnable.java b/src/eu/alefzero/owncloud/authenticator/AuthenticationRunnable.java
index 445524c..d156a76 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/AuthenticationRunnable.java
+++ b/src/eu/alefzero/owncloud/authenticator/AuthenticationRunnable.java
@@ -34,9 +34,7 @@ public class AuthenticationRunnable implements Runnable {
   private URL mUrl;
   private String mUsername;
   private String mPassword;
   private URL mUrl;
   private String mUsername;
   private String mPassword;

-  
-  private static final String WEBDAV_2_0_PATH = "/files/webdav.php";
-  
+

   public AuthenticationRunnable(URL url, String username, String password) {
     mListener = null;
     mUrl = url;
   public AuthenticationRunnable(URL url, String username, String password) {
     mListener = null;
     mUrl = url;


@@ -51,7 +49,8 @@ public class AuthenticationRunnable implements Runnable {
   
   @Override
   public void run() {
   
   @Override
   public void run() {

-    Uri uri = Uri.parse(mUrl.toString() + WEBDAV_2_0_PATH);
+    Uri uri;
+    uri = Uri.parse(mUrl.toString());

     WebdavClient client = new WebdavClient(uri);
     client.setCredentials(mUsername, mPassword);
     int login_result = client.tryToLogin(); 
     WebdavClient client = new WebdavClient(uri);
     client.setCredentials(mUsername, mPassword);
     int login_result = client.tryToLogin(); 


@@ -71,11 +70,11 @@ public class AuthenticationRunnable implements Runnable {
   }
 
   private void postResult(final boolean success, final String message) {
   }
 
   private void postResult(final boolean success, final String message) {

-    if (mHandler != null) {
+    if (mHandler != null && mListener != null) {

       mHandler.post(new Runnable() {
         @Override
         public void run() {
       mHandler.post(new Runnable() {
         @Override
         public void run() {

-          AuthenticationRunnable.this.mListener.onAuthenticationResult(success, message);
+          mListener.onAuthenticationResult(success, message);

         }
       });
     }
         }
       });
     }