Merge remote-tracking branch 'upstream/develop' into

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / CredentialsDialogFragment.java

diff --git a/src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java b/src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
index 1b35057..080316b 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
@@ -127,18 +127,18 @@ public class CredentialsDialogFragment extends SherlockDialogFragment
     public void onClick(DialogInterface dialog, int which) {
         if (which == AlertDialog.BUTTON_POSITIVE) { 
 
     public void onClick(DialogInterface dialog, int which) {
         if (which == AlertDialog.BUTTON_POSITIVE) { 
 

-            String username = mUsernameET.getText().toString().trim();
-            String password = mPasswordET.getText().toString().trim();
+            String username = mUsernameET.getText().toString();
+            String password = mPasswordET.getText().toString();

 
             // Proceed with the authentication
             mHandler.proceed(username, password);
 
             // Proceed with the authentication
             mHandler.proceed(username, password);

-            dialog.dismiss();

 
         } else if (which == AlertDialog.BUTTON_NEGATIVE) {
 
         } else if (which == AlertDialog.BUTTON_NEGATIVE) {

-            dialog.dismiss();

             mWebView.stopLoading();
             ((AuthenticatorActivity)getActivity()).doNegativeAuthenticatioDialogClick();
         }
             mWebView.stopLoading();
             ((AuthenticatorActivity)getActivity()).doNegativeAuthenticatioDialogClick();
         }

+
+        dialog.dismiss();

     }
     
     
     }