Server or connection errors in authorization require handled as in server check

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index cc1adcf..c1ca605 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -76,7 +76,7 @@ import eu.alefzero.webdav.WebdavClient;
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r

-        implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener {\r
+implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener {\r

 \r
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
 \r
 \r
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
 \r


@@ -84,7 +84,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public static final String EXTRA_USER_NAME = "USER_NAME";\r
     public static final String EXTRA_HOST_NAME = "HOST_NAME";\r
     public static final String EXTRA_ACTION = "ACTION";\r
     public static final String EXTRA_USER_NAME = "USER_NAME";\r
     public static final String EXTRA_HOST_NAME = "HOST_NAME";\r
     public static final String EXTRA_ACTION = "ACTION";\r

-    \r
+\r

     private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";\r
     private static final String KEY_OC_VERSION = "OC_VERSION";\r
     private static final String KEY_ACCOUNT = "ACCOUNT";\r
     private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";\r
     private static final String KEY_OC_VERSION = "OC_VERSION";\r
     private static final String KEY_ACCOUNT = "ACCOUNT";\r


@@ -97,7 +97,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private static final String KEY_PASSWORD_VISIBLE = "PASSWORD_VISIBLE";\r
     private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";\r
     private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";\r
     private static final String KEY_PASSWORD_VISIBLE = "PASSWORD_VISIBLE";\r
     private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";\r
     private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";\r

-    \r
+\r

     private static final String OAUTH_MODE_ON = "on";\r
     private static final String OAUTH_MODE_OFF = "off";\r
     private static final String OAUTH_MODE_OPTIONAL = "optional";\r
     private static final String OAUTH_MODE_ON = "on";\r
     private static final String OAUTH_MODE_OFF = "off";\r
     private static final String OAUTH_MODE_OPTIONAL = "optional";\r


@@ -110,14 +110,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public static final byte ACTION_CREATE = 0;\r
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r
     public static final byte ACTION_CREATE = 0;\r
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r

-    \r
+\r

     private String mHostBaseUrl;\r
     private OwnCloudVersion mDiscoveredVersion;\r
     private String mHostBaseUrl;\r
     private OwnCloudVersion mDiscoveredVersion;\r

-    \r
+\r

     private int mServerStatusText, mServerStatusIcon;\r
     private boolean mServerIsChecked, mServerIsValid, mIsSslConn;\r
     private int mAuthStatusText, mAuthStatusIcon;    \r
     private int mServerStatusText, mServerStatusIcon;\r
     private boolean mServerIsChecked, mServerIsValid, mIsSslConn;\r
     private int mAuthStatusText, mAuthStatusIcon;    \r

-    \r
+\r

     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private OwnCloudServerCheckOperation mOcServerChkOperation;\r
     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private OwnCloudServerCheckOperation mOcServerChkOperation;\r


@@ -125,12 +125,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private RemoteOperationResult mLastSslUntrustedServerResult;\r
 \r
     private Uri mNewCapturedUriFromOAuth2Redirection;\r
     private RemoteOperationResult mLastSslUntrustedServerResult;\r
 \r
     private Uri mNewCapturedUriFromOAuth2Redirection;\r

-    \r
+\r

     private AccountManager mAccountMgr;\r
     private boolean mJustCreated;\r
     private byte mAction;\r
     private Account mAccount;\r
     private AccountManager mAccountMgr;\r
     private boolean mJustCreated;\r
     private byte mAction;\r
     private Account mAccount;\r

-    \r
+\r

     private EditText mHostUrlInput;\r
     private EditText mUsernameInput;\r
     private EditText mPasswordInput;\r
     private EditText mHostUrlInput;\r
     private EditText mUsernameInput;\r
     private EditText mPasswordInput;\r


@@ -138,11 +138,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private String mOAuthAccessToken;\r
     private View mOkButton;\r
     private TextView mAuthStatusLayout;\r
     private String mOAuthAccessToken;\r
     private View mOkButton;\r
     private TextView mAuthStatusLayout;\r

-    \r
+\r

     private TextView mOAuthAuthEndpointText;\r
     private TextView mOAuthTokenEndpointText;\r
 \r
     private TextView mOAuthAuthEndpointText;\r
     private TextView mOAuthTokenEndpointText;\r
 \r

-    \r
+\r

     /**\r
      * {@inheritDoc}\r
      * \r
     /**\r
      * {@inheritDoc}\r
      * \r


@@ -152,7 +152,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     protected void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
     protected void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r

-        \r
+\r

         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r
         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r


@@ -163,7 +163,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r

-        \r
+\r

         /// complete label for 'register account' button\r
         Button b = (Button) findViewById(R.id.account_register);\r
         if (b != null) {\r
         /// complete label for 'register account' button\r
         Button b = (Button) findViewById(R.id.account_register);\r
         if (b != null) {\r


@@ -184,11 +184,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mServerIsChecked = false;\r
             mIsSslConn = false;\r
             mAuthStatusText = mAuthStatusIcon = 0;\r
             mServerIsChecked = false;\r
             mIsSslConn = false;\r
             mAuthStatusText = mAuthStatusIcon = 0;\r

-            \r
+\r

             /// retrieve extras from intent\r
             String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType) || OAUTH_MODE_ON.equals(getString(R.string.oauth2_mode));\r
             /// retrieve extras from intent\r
             String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType) || OAUTH_MODE_ON.equals(getString(R.string.oauth2_mode));\r

-            \r
+\r

             mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
             if (mAccount != null) {\r
                 String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);\r
             mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
             if (mAccount != null) {\r
                 String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);\r


@@ -203,7 +203,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }\r
             mOAuth2Check.setChecked(oAuthRequired);\r
             changeViewByOAuth2Check(oAuthRequired);\r
             }\r
             mOAuth2Check.setChecked(oAuthRequired);\r
             changeViewByOAuth2Check(oAuthRequired);\r

-            \r
+\r

 \r
         } else {\r
             /// connection state and info\r
 \r
         } else {\r
             /// connection state and info\r


@@ -224,26 +224,26 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
             }\r
             mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r
                 mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
             }\r
             mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r

-            \r
+\r

             // account data, if updating\r
             mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
             // account data, if updating\r
             mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r

-            \r
+\r

             // check if server check was interrupted by a configuration change\r
             if (savedInstanceState.getBoolean(KEY_SERVER_CHECK_IN_PROGRESS, false)) {\r
                 checkOcServer();\r
             }\r
             // check if server check was interrupted by a configuration change\r
             if (savedInstanceState.getBoolean(KEY_SERVER_CHECK_IN_PROGRESS, false)) {\r
                 checkOcServer();\r
             }\r

-            \r
+\r

         }\r
         }\r

-        \r
+\r

         showServerStatus();\r
         showAuthStatus();\r
         if (mServerIsChecked && !mServerIsValid) showRefreshButton();\r
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
         showServerStatus();\r
         showAuthStatus();\r
         if (mServerIsChecked && !mServerIsValid) showRefreshButton();\r
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r

-        \r
+\r

         if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r
         if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r

-        \r
+\r

         if (mAction == ACTION_UPDATE_TOKEN) {\r
             /// lock things that should not change\r
             mHostUrlInput.setEnabled(false);\r
         if (mAction == ACTION_UPDATE_TOKEN) {\r
             /// lock things that should not change\r
             mHostUrlInput.setEnabled(false);\r


@@ -253,10 +253,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 checkOcServer(); \r
             }\r
         }\r
                 checkOcServer(); \r
             }\r
         }\r

-        \r
+\r

         mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)\r
         mJustCreated = true;\r
         mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)\r
         mJustCreated = true;\r

-        \r
+\r

         /// bind view elements to listeners\r
         mHostUrlInput.setOnFocusChangeListener(this);\r
         mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() {\r
         /// bind view elements to listeners\r
         mHostUrlInput.setOnFocusChangeListener(this);\r
         mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() {\r


@@ -282,7 +282,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
             @Override\r
             public void onTextChanged(CharSequence s, int start, int before, int count) {}\r
 \r
             @Override\r
             public void onTextChanged(CharSequence s, int start, int before, int count) {}\r

-            \r
+\r

         });\r
         mPasswordInput.setOnFocusChangeListener(this);\r
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);\r
         });\r
         mPasswordInput.setOnFocusChangeListener(this);\r
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);\r


@@ -297,7 +297,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }\r
         });\r
     }\r
             }\r
         });\r
     }\r

-    \r
+\r

     /**\r
      * Saves relevant state before {@link #onPause()}\r
      * \r
     /**\r
      * Saves relevant state before {@link #onPause()}\r
      * \r


@@ -309,7 +309,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r

-        \r
+\r

         /// connection state and info\r
         outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);\r
         outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);\r
         /// connection state and info\r
         outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);\r
         outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);\r


@@ -320,18 +320,18 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         outState.putBoolean(KEY_PASSWORD_VISIBLE, isPasswordVisible());\r
         outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);\r
         outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);\r
         outState.putBoolean(KEY_PASSWORD_VISIBLE, isPasswordVisible());\r
         outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);\r
         outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);\r

-        \r
+\r

         /// server data\r
         if (mDiscoveredVersion != null) {\r
             outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());\r
         }\r
         outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r
         /// server data\r
         if (mDiscoveredVersion != null) {\r
             outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());\r
         }\r
         outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r

-        \r
+\r

         /// account data, if updating\r
         if (mAccount != null) {\r
             outState.putParcelable(KEY_ACCOUNT, mAccount);\r
         }\r
         /// account data, if updating\r
         if (mAccount != null) {\r
             outState.putParcelable(KEY_ACCOUNT, mAccount);\r
         }\r

-        \r
+\r

     }\r
 \r
 \r
     }\r
 \r
 \r


@@ -351,7 +351,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    \r
+\r

     /**\r
      * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and \r
      * deferred in {@link #onNewIntent(Intent)}, is processed here.\r
     /**\r
      * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and \r
      * deferred in {@link #onNewIntent(Intent)}, is processed here.\r


@@ -367,15 +367,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             else\r
                 Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
         }\r
             else\r
                 Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
         }\r

-        \r
+\r

         if (mNewCapturedUriFromOAuth2Redirection != null) {\r
             getOAuth2AccessTokenFromCapturedRedirection();            \r
         }\r
         if (mNewCapturedUriFromOAuth2Redirection != null) {\r
             getOAuth2AccessTokenFromCapturedRedirection();            \r
         }\r

-        \r
+\r

         mJustCreated = false;\r
     }\r
         mJustCreated = false;\r
     }\r

-    \r
-    \r
+\r
+\r

     /**\r
      * Parses the redirection with the response to the GET AUTHORIZATION request to the \r
      * oAuth server and requests for the access token (GET ACCESS TOKEN)\r
     /**\r
      * Parses the redirection with the response to the GET AUTHORIZATION request to the \r
      * oAuth server and requests for the access token (GET ACCESS TOKEN)\r


@@ -384,34 +384,39 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         /// Parse data from OAuth redirection\r
         String queryParameters = mNewCapturedUriFromOAuth2Redirection.getQuery();\r
         mNewCapturedUriFromOAuth2Redirection = null;\r
         /// Parse data from OAuth redirection\r
         String queryParameters = mNewCapturedUriFromOAuth2Redirection.getQuery();\r
         mNewCapturedUriFromOAuth2Redirection = null;\r

-        \r
+\r

         /// Showing the dialog with instructions for the user.\r
         showDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
 \r
         /// GET ACCESS TOKEN to the oAuth server \r
         RemoteOperation operation = new OAuth2GetAccessToken(   getString(R.string.oauth2_client_id), \r
         /// Showing the dialog with instructions for the user.\r
         showDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
 \r
         /// GET ACCESS TOKEN to the oAuth server \r
         RemoteOperation operation = new OAuth2GetAccessToken(   getString(R.string.oauth2_client_id), \r

-                                                                getString(R.string.oauth2_redirect_uri),       \r
-                                                                getString(R.string.oauth2_grant_type),\r
-                                                                queryParameters);\r
+                getString(R.string.oauth2_redirect_uri),       \r
+                getString(R.string.oauth2_grant_type),\r
+                queryParameters);\r

         //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());\r
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext());\r
         operation.execute(client, this, mHandler);\r
     }\r
         //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());\r
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext());\r
         operation.execute(client, this, mHandler);\r
     }\r

-    \r

 \r
 \r

-    \r
+\r
+\r

     /**\r
      * Handles the change of focus on the text inputs for the server URL and the password\r
      */\r
     public void onFocusChange(View view, boolean hasFocus) {\r
     /**\r
      * Handles the change of focus on the text inputs for the server URL and the password\r
      */\r
     public void onFocusChange(View view, boolean hasFocus) {\r

-        if (view.getId() == R.id.hostUrlInput && !hasFocus) {\r
-            onUrlInputFocusLost((TextView) view);\r
-            \r
+        if (view.getId() == R.id.hostUrlInput) {   \r
+            if (!hasFocus) {\r
+                onUrlInputFocusLost((TextView) view);\r
+            }\r
+            else {\r
+                hideRefreshButton();\r
+            }\r
+\r

         } else if (view.getId() == R.id.account_password) {\r
             onPasswordFocusChanged((TextView) view, hasFocus);\r
         }\r
     }\r
         } else if (view.getId() == R.id.account_password) {\r
             onPasswordFocusChanged((TextView) view, hasFocus);\r
         }\r
     }\r

-    \r
+\r

 \r
     /**\r
      * Handles changes in focus on the text input for the server URL.\r
 \r
     /**\r
      * Handles changes in focus on the text input for the server URL.\r


@@ -517,9 +522,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         setResult(RESULT_CANCELED);     // TODO review how is this related to AccountAuthenticator (debugging)\r
         finish();\r
     }\r
         setResult(RESULT_CANCELED);     // TODO review how is this related to AccountAuthenticator (debugging)\r
         finish();\r
     }\r

-    \r
-    \r
-    \r
+\r
+\r
+\r

     /**\r
      * Checks the credentials of the user in the root of the ownCloud server\r
      * before creating a new local account.\r
     /**\r
      * Checks the credentials of the user in the root of the ownCloud server\r
      * before creating a new local account.\r


@@ -544,16 +549,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             Log_OC.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r
             return;\r
         }\r
             Log_OC.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r
             return;\r
         }\r

-        \r
+\r

         if (mOAuth2Check.isChecked()) {\r
             startOauthorization();\r
         if (mOAuth2Check.isChecked()) {\r
             startOauthorization();\r

-            \r
+\r

         } else {\r
             checkBasicAuthorization();\r
         }\r
     }\r
         } else {\r
             checkBasicAuthorization();\r
         }\r
     }\r

-    \r
-    \r
+\r
+\r

     /**\r
      * Tests the credentials entered by the user performing a check of existence on \r
      * the root folder of the ownCloud server.\r
     /**\r
      * Tests the credentials entered by the user performing a check of existence on \r
      * the root folder of the ownCloud server.\r


@@ -561,14 +566,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void checkBasicAuthorization() {\r
         /// get the path to the root folder through WebDAV from the version server\r
         String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, false);\r
     private void checkBasicAuthorization() {\r
         /// get the path to the root folder through WebDAV from the version server\r
         String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, false);\r

-        \r
+\r

         /// get basic credentials entered by user\r
         String username = mUsernameInput.getText().toString();\r
         String password = mPasswordInput.getText().toString();\r
         /// get basic credentials entered by user\r
         String username = mUsernameInput.getText().toString();\r
         String password = mPasswordInput.getText().toString();\r

-        \r
+\r

         /// be gentle with the user\r
         showDialog(DIALOG_LOGIN_PROGRESS);\r
         /// be gentle with the user\r
         showDialog(DIALOG_LOGIN_PROGRESS);\r

-        \r
+\r

         /// test credentials accessing the root folder\r
         mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
         /// test credentials accessing the root folder\r
         mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r


@@ -586,7 +591,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mAuthStatusIcon = R.drawable.progress_small;\r
         mAuthStatusText = R.string.oauth_login_connection;\r
         showAuthStatus();\r
         mAuthStatusIcon = R.drawable.progress_small;\r
         mAuthStatusText = R.string.oauth_login_connection;\r
         showAuthStatus();\r

-        \r
+\r

         // GET AUTHORIZATION request\r
         //Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth));\r
         Uri uri = Uri.parse(mOAuthAuthEndpointText.getText().toString().trim());\r
         // GET AUTHORIZATION request\r
         //Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth));\r
         Uri uri = Uri.parse(mOAuthAuthEndpointText.getText().toString().trim());\r


@@ -602,7 +607,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         startActivity(i);\r
     }\r
 \r
         startActivity(i);\r
     }\r
 \r

-    \r
+\r

     /**\r
      * Callback method invoked when a RemoteOperation executed by this Activity finishes.\r
      * \r
     /**\r
      * Callback method invoked when a RemoteOperation executed by this Activity finishes.\r
      * \r


@@ -613,16 +618,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
         if (operation instanceof OwnCloudServerCheckOperation) {\r
             onOcServerCheckFinish((OwnCloudServerCheckOperation) operation, result);\r
 \r
         if (operation instanceof OwnCloudServerCheckOperation) {\r
             onOcServerCheckFinish((OwnCloudServerCheckOperation) operation, result);\r

-            \r
+\r

         } else if (operation instanceof OAuth2GetAccessToken) {\r
             onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r
         } else if (operation instanceof OAuth2GetAccessToken) {\r
             onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r

-                \r
+\r

         } else if (operation instanceof ExistenceCheckOperation)  {\r
             onAuthorizationCheckFinish((ExistenceCheckOperation)operation, result);\r
         } else if (operation instanceof ExistenceCheckOperation)  {\r
             onAuthorizationCheckFinish((ExistenceCheckOperation)operation, result);\r

-                \r
+\r

         }\r
     }\r
         }\r
     }\r

-    \r
+\r

 \r
     /**\r
      * Processes the result of the server check performed when the user finishes the enter of the\r
 \r
     /**\r
      * Processes the result of the server check performed when the user finishes the enter of the\r


@@ -638,7 +643,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mServerIsValid = result.isSuccess();\r
             mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
             mOcServerChkOperation = null;\r
             mServerIsValid = result.isSuccess();\r
             mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
             mOcServerChkOperation = null;\r

-            \r
+\r

             /// update status icon and text\r
             if (mServerIsValid) {\r
                 hideRefreshButton();\r
             /// update status icon and text\r
             if (mServerIsValid) {\r
                 hideRefreshButton();\r


@@ -647,22 +652,22 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }\r
             updateServerStatusIconAndText(result);\r
             showServerStatus();\r
             }\r
             updateServerStatusIconAndText(result);\r
             showServerStatus();\r

-    \r
+\r

             /// very special case (TODO: move to a common place for all the remote operations)\r
             if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
                 mLastSslUntrustedServerResult = result;\r
                 showDialog(DIALOG_SSL_VALIDATOR); \r
             }\r
             /// very special case (TODO: move to a common place for all the remote operations)\r
             if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
                 mLastSslUntrustedServerResult = result;\r
                 showDialog(DIALOG_SSL_VALIDATOR); \r
             }\r

-            \r
+\r

             /// retrieve discovered version and normalize server URL\r
             mDiscoveredVersion = operation.getDiscoveredVersion();\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
             /// retrieve discovered version and normalize server URL\r
             mDiscoveredVersion = operation.getDiscoveredVersion();\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r

-            \r
+\r

             /// allow or not the user try to access the server\r
             mOkButton.setEnabled(mServerIsValid);\r
             /// allow or not the user try to access the server\r
             mOkButton.setEnabled(mServerIsValid);\r

-            \r
+\r

         }   // else nothing ; only the last check operation is considered; \r
         }   // else nothing ; only the last check operation is considered; \r

-            // multiple can be triggered if the user amends a URL before a previous check can be triggered\r
+        // multiple can be triggered if the user amends a URL before a previous check can be triggered\r

     }\r
 \r
 \r
     }\r
 \r
 \r


@@ -676,7 +681,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 } else {\r
                     url = "http://" + url;\r
                 }\r
                 } else {\r
                     url = "http://" + url;\r
                 }\r

-                \r
+\r

             }\r
             if (url.endsWith("/")) {\r
                 url = url.substring(0, url.length() - 1);\r
             }\r
             if (url.endsWith("/")) {\r
                 url = url.substring(0, url.length() - 1);\r


@@ -698,7 +703,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mServerStatusIcon = android.R.drawable.ic_secure;\r
             mServerStatusText = R.string.auth_secure_connection;\r
             break;\r
             mServerStatusIcon = android.R.drawable.ic_secure;\r
             mServerStatusText = R.string.auth_secure_connection;\r
             break;\r

-            \r
+\r

         case OK_NO_SSL:\r
         case OK:\r
             if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r
         case OK_NO_SSL:\r
         case OK:\r
             if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r


@@ -709,12 +714,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusIcon = android.R.drawable.ic_partial_secure;\r
             }\r
             break;\r
                 mServerStatusIcon = android.R.drawable.ic_partial_secure;\r
             }\r
             break;\r

-            \r
+\r

         case NO_NETWORK_CONNECTION:\r
             mServerStatusIcon = R.drawable.no_network;\r
             mServerStatusText = R.string.auth_no_net_conn_title;\r
             break;\r
         case NO_NETWORK_CONNECTION:\r
             mServerStatusIcon = R.drawable.no_network;\r
             mServerStatusText = R.string.auth_no_net_conn_title;\r
             break;\r

-            \r
+\r

         case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
             mServerStatusText = R.string.auth_ssl_unverified_server_title;\r
             break;\r
         case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
             mServerStatusText = R.string.auth_ssl_unverified_server_title;\r
             break;\r


@@ -775,7 +780,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mAuthStatusIcon = android.R.drawable.ic_secure;\r
             mAuthStatusText = R.string.auth_secure_connection;\r
             break;\r
             mAuthStatusIcon = android.R.drawable.ic_secure;\r
             mAuthStatusText = R.string.auth_secure_connection;\r
             break;\r

-            \r
+\r

         case OK_NO_SSL:\r
         case OK:\r
             if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r
         case OK_NO_SSL:\r
         case OK:\r
             if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r


@@ -786,12 +791,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mAuthStatusIcon = android.R.drawable.ic_partial_secure;\r
             }\r
             break;\r
                 mAuthStatusIcon = android.R.drawable.ic_partial_secure;\r
             }\r
             break;\r

-            \r
+\r

         case NO_NETWORK_CONNECTION:\r
             mAuthStatusIcon = R.drawable.no_network;\r
             mAuthStatusText = R.string.auth_no_net_conn_title;\r
             break;\r
         case NO_NETWORK_CONNECTION:\r
             mAuthStatusIcon = R.drawable.no_network;\r
             mAuthStatusText = R.string.auth_no_net_conn_title;\r
             break;\r

-            \r
+\r

         case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
             mAuthStatusText = R.string.auth_ssl_unverified_server_title;\r
             break;\r
         case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
             mAuthStatusText = R.string.auth_ssl_unverified_server_title;\r
             break;\r


@@ -857,7 +862,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         if (result.isSuccess() && webdav_path != null) {\r
             /// be gentle with the user\r
             showDialog(DIALOG_LOGIN_PROGRESS);\r
         if (result.isSuccess() && webdav_path != null) {\r
             /// be gentle with the user\r
             showDialog(DIALOG_LOGIN_PROGRESS);\r

-            \r
+\r

             /// time to test the retrieved access token on the ownCloud server\r
             mOAuthAccessToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Constants.KEY_ACCESS_TOKEN);\r
             Log_OC.d(TAG, "Got ACCESS TOKEN: " + mOAuthAccessToken);\r
             /// time to test the retrieved access token on the ownCloud server\r
             mOAuthAccessToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Constants.KEY_ACCESS_TOKEN);\r
             Log_OC.d(TAG, "Got ACCESS TOKEN: " + mOAuthAccessToken);\r


@@ -865,7 +870,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
             client.setBearerCredentials(mOAuthAccessToken);\r
             mAuthCheckOperation.execute(client, this, mHandler);\r
             WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
             client.setBearerCredentials(mOAuthAccessToken);\r
             mAuthCheckOperation.execute(client, this, mHandler);\r

-            \r
+\r

         } else {\r
             updateAuthStatusIconAndText(result);\r
             showAuthStatus();\r
         } else {\r
             updateAuthStatusIconAndText(result);\r
             showAuthStatus();\r


@@ -873,7 +878,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    \r
+\r

     /**\r
      * Processes the result of the access check performed to try the user credentials.\r
      * \r
     /**\r
      * Processes the result of the access check performed to try the user credentials.\r
      * \r


@@ -888,27 +893,53 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         } catch (IllegalArgumentException e) {\r
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
         }\r
         } catch (IllegalArgumentException e) {\r
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
         }\r

-        \r
+\r

         if (result.isSuccess()) {\r
             Log_OC.d(TAG, "Successful access - time to save the account");\r
 \r
             if (mAction == ACTION_CREATE) {\r
                 createAccount();\r
         if (result.isSuccess()) {\r
             Log_OC.d(TAG, "Successful access - time to save the account");\r
 \r
             if (mAction == ACTION_CREATE) {\r
                 createAccount();\r

-                \r
+\r

             } else {\r
                 updateToken();\r
             }\r
             } else {\r
                 updateToken();\r
             }\r

-            \r
+\r

             finish();\r
             finish();\r

+\r
+        } else if (result.isServerFail() || result.isException()) {\r
+            /// if server fail or exception in authorization, the UI is updated as when a server check failed\r
+            mServerIsChecked = true;\r
+            mServerIsValid = false;\r
+            mIsSslConn = false;\r
+            mOcServerChkOperation = null;\r
+            mDiscoveredVersion = null;\r
+            mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
+\r
+            // update status icon and text\r
+            updateServerStatusIconAndText(result);\r
+            showServerStatus();\r
+            mAuthStatusIcon = 0;\r
+            mAuthStatusText = 0;\r
+            showAuthStatus();\r

             \r
             \r

-        } else {\r
+            // update input controls state\r
+            showRefreshButton();\r
+            mOkButton.setEnabled(false);\r
+\r
+            // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r
+            if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
+                mLastSslUntrustedServerResult = result;\r
+                showDialog(DIALOG_SSL_VALIDATOR); \r
+            }\r
+\r
+        } else {    // authorization fail due to client side - probably wrong credentials\r

             updateAuthStatusIconAndText(result);\r
             showAuthStatus();\r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r
     }\r
 \r
             updateAuthStatusIconAndText(result);\r
             showAuthStatus();\r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r
     }\r
 \r

-    \r
+\r

     /**\r
      * Sets the proper response to get that the Account Authenticator that started this activity saves \r
      * a new authorization token for mAccount.\r
     /**\r
      * Sets the proper response to get that the Account Authenticator that started this activity saves \r
      * a new authorization token for mAccount.\r


@@ -940,7 +971,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void createAccount() {\r
         /// create and save new ownCloud account\r
         boolean isOAuth = mOAuth2Check.isChecked();\r
     private void createAccount() {\r
         /// create and save new ownCloud account\r
         boolean isOAuth = mOAuth2Check.isChecked();\r

-        \r
+\r

         Uri uri = Uri.parse(mHostBaseUrl);\r
         String username = mUsernameInput.getText().toString().trim();\r
         if (isOAuth) {\r
         Uri uri = Uri.parse(mHostBaseUrl);\r
         String username = mUsernameInput.getText().toString().trim();\r
         if (isOAuth) {\r


@@ -982,10 +1013,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);\r
         if (isOAuth)\r
             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  // TODO this flag should be unnecessary\r
         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);\r
         if (isOAuth)\r
             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  // TODO this flag should be unnecessary\r

-    \r
+\r

         setAccountAuthenticatorResult(intent.getExtras());\r
         setResult(RESULT_OK, intent);\r
         setAccountAuthenticatorResult(intent.getExtras());\r
         setResult(RESULT_OK, intent);\r

-        \r
+\r

         /// immediately request for the synchronization of the new account\r
         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
         /// immediately request for the synchronization of the new account\r
         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r


@@ -1016,7 +1047,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    \r
+\r

     /**\r
      * {@inheritDoc}\r
      */\r
     /**\r
      * {@inheritDoc}\r
      */\r


@@ -1031,17 +1062,17 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             working_dialog.setIndeterminate(true);\r
             working_dialog.setCancelable(true);\r
             working_dialog\r
             working_dialog.setIndeterminate(true);\r
             working_dialog.setCancelable(true);\r
             working_dialog\r

-                    .setOnCancelListener(new DialogInterface.OnCancelListener() {\r
-                        @Override\r
-                        public void onCancel(DialogInterface dialog) {\r
-                            /// TODO study if this is enough\r
-                            Log_OC.i(TAG, "Login canceled");\r
-                            if (mOperationThread != null) {\r
-                                mOperationThread.interrupt();\r
-                                finish();\r
-                            }\r
-                        }\r
-                    });\r
+            .setOnCancelListener(new DialogInterface.OnCancelListener() {\r
+                @Override\r
+                public void onCancel(DialogInterface dialog) {\r
+                    /// TODO study if this is enough\r
+                    Log_OC.i(TAG, "Login canceled");\r
+                    if (mOperationThread != null) {\r
+                        mOperationThread.interrupt();\r
+                        finish();\r
+                    }\r
+                }\r
+            });\r

             dialog = working_dialog;\r
             break;\r
         }\r
             dialog = working_dialog;\r
             break;\r
         }\r


@@ -1071,11 +1102,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
             builder.setCancelable(false);\r
             builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {\r
             builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
             builder.setCancelable(false);\r
             builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {\r

-                    @Override\r
-                    public void onClick(DialogInterface dialog, int which) {\r
-                        dialog.dismiss();\r
-                    };\r
-                });\r
+                @Override\r
+                public void onClick(DialogInterface dialog, int which) {\r
+                    dialog.dismiss();\r
+                };\r
+            });\r

             dialog = builder.create();\r
             break;\r
         }\r
             dialog = builder.create();\r
             break;\r
         }\r


@@ -1085,7 +1116,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         return dialog;\r
     }\r
 \r
         return dialog;\r
     }\r
 \r

-    \r
+\r

     /**\r
      * Starts and activity to open the 'new account' page in the ownCloud web site\r
      * \r
     /**\r
      * Starts and activity to open the 'new account' page in the ownCloud web site\r
      * \r


@@ -1097,7 +1128,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         startActivity(register);\r
     }\r
 \r
         startActivity(register);\r
     }\r
 \r

-    \r
+\r

     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the last check on the ownCloud server.\r
     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the last check on the ownCloud server.\r


@@ -1107,16 +1138,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
         if (mServerStatusIcon == 0 && mServerStatusText == 0) {\r
             tv.setVisibility(View.INVISIBLE);\r
 \r
         if (mServerStatusIcon == 0 && mServerStatusText == 0) {\r
             tv.setVisibility(View.INVISIBLE);\r

-            \r
+\r

         } else {\r
             tv.setText(mServerStatusText);\r
             tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);\r
             tv.setVisibility(View.VISIBLE);\r
         }\r
         } else {\r
             tv.setText(mServerStatusText);\r
             tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);\r
             tv.setVisibility(View.VISIBLE);\r
         }\r

-        \r
+\r

     }\r
     }\r

-    \r
-    \r
+\r
+\r

     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the interactions with the OAuth authorization server.\r
     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the interactions with the OAuth authorization server.\r


@@ -1124,7 +1155,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void showAuthStatus() {\r
         if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {\r
             mAuthStatusLayout.setVisibility(View.INVISIBLE);\r
     private void showAuthStatus() {\r
         if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {\r
             mAuthStatusLayout.setVisibility(View.INVISIBLE);\r

-            \r
+\r

         } else {\r
             mAuthStatusLayout.setText(mAuthStatusText);\r
             mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);\r
         } else {\r
             mAuthStatusLayout.setText(mAuthStatusText);\r
             mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);\r


@@ -1132,15 +1163,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
     }     \r
 \r
         }\r
     }     \r
 \r

-    \r
+\r

     private void showRefreshButton() {\r
         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);\r
     }\r
     private void showRefreshButton() {\r
         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);\r
     }\r

-    \r
+\r

     private void hideRefreshButton() {\r
         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
     }\r
     private void hideRefreshButton() {\r
         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
     }\r

-    \r
+\r

     /**\r
      * Called when the refresh button in the input field for ownCloud host is clicked.\r
      * \r
     /**\r
      * Called when the refresh button in the input field for ownCloud host is clicked.\r
      * \r


@@ -1153,7 +1184,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
     \r
     \r
     }\r
     \r
     \r

-    \r

     /**\r
      * Called when the eye icon in the password field is clicked.\r
      * \r
     /**\r
      * Called when the eye icon in the password field is clicked.\r
      * \r


@@ -1169,8 +1199,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
         mPasswordInput.setSelection(selectionStart, selectionEnd);\r
     }    \r
         }\r
         mPasswordInput.setSelection(selectionStart, selectionEnd);\r
     }    \r

-    \r
-    \r
+\r
+\r

     /**\r
      * Called when the checkbox for OAuth authorization is clicked.\r
      * \r
     /**\r
      * Called when the checkbox for OAuth authorization is clicked.\r
      * \r


@@ -1183,7 +1213,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         changeViewByOAuth2Check(oAuth2Check.isChecked());\r
 \r
     }\r
         changeViewByOAuth2Check(oAuth2Check.isChecked());\r
 \r
     }\r

-    \r
+\r

     /**\r
      * Changes the visibility of input elements depending upon the kind of authorization\r
      * chosen by the user: basic or OAuth\r
     /**\r
      * Changes the visibility of input elements depending upon the kind of authorization\r
      * chosen by the user: basic or OAuth\r


@@ -1191,7 +1221,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param checked       'True' when OAuth is selected.\r
      */\r
     public void changeViewByOAuth2Check(Boolean checked) {\r
      * @param checked       'True' when OAuth is selected.\r
      */\r
     public void changeViewByOAuth2Check(Boolean checked) {\r

-        \r
+\r

         if (checked) {\r
             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
         if (checked) {\r
             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r


@@ -1205,7 +1235,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }     \r
 \r
     }    \r
         }     \r
 \r
     }    \r

-    \r
+\r

     /**\r
      * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
      */\r
     /**\r
      * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
      */\r


@@ -1239,7 +1269,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         return false;   // always return false to grant that the software keyboard is hidden anyway\r
     }\r
 \r
         return false;   // always return false to grant that the software keyboard is hidden anyway\r
     }\r
 \r

-    \r
+\r

     private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {\r
 \r
         private int fuzz = 75;\r
     private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {\r
 \r
         private int fuzz = 75;\r


@@ -1268,8 +1298,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }\r
             return false;\r
         }\r
             }\r
             return false;\r
         }\r

-        \r
+\r

         public abstract boolean onDrawableTouch(final MotionEvent event);\r
     }\r
         public abstract boolean onDrawableTouch(final MotionEvent event);\r
     }\r

-    \r
+\r

 }\r
 }\r