Fixed comments in PR#246

[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 e4787fb..138c860 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -18,22 +18,7 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
 \r
 package com.owncloud.android.authentication;\r
 \r

-import com.owncloud.android.AccountUtils;\r
-import com.owncloud.android.Log_OC;\r
-import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
-import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
-import com.owncloud.android.utils.OwnCloudVersion;\r
-import com.owncloud.android.network.OwnCloudClientUtils;\r
-import com.owncloud.android.operations.OwnCloudServerCheckOperation;\r
-import com.owncloud.android.operations.ExistenceCheckOperation;\r
-import com.owncloud.android.operations.OAuth2GetAccessToken;\r
-import com.owncloud.android.operations.OnRemoteOperationListener;\r
-import com.owncloud.android.operations.RemoteOperation;\r
-import com.owncloud.android.operations.RemoteOperationResult;\r
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
-\r

 import android.accounts.Account;\r
 import android.accounts.Account;\r

-import android.accounts.AccountAuthenticatorActivity;\r

 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r


@@ -42,22 +27,44 @@ import android.content.ContentResolver;
 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.SharedPreferences;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.SharedPreferences;\r

+import android.graphics.Rect;\r
+import android.graphics.drawable.Drawable;\r

 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r

+import android.text.Editable;\r

 import android.text.InputType;\r
 import android.text.InputType;\r

+import android.text.TextWatcher;\r
+import android.view.KeyEvent;\r
+import android.view.MotionEvent;\r

 import android.view.View;\r
 import android.view.View.OnFocusChangeListener;\r
 import android.view.View;\r
 import android.view.View.OnFocusChangeListener;\r

+import android.view.View.OnTouchListener;\r

 import android.view.Window;\r
 import android.view.Window;\r

+import android.view.inputmethod.EditorInfo;\r
+import android.widget.Button;\r

 import android.widget.CheckBox;\r
 import android.widget.EditText;\r
 import android.widget.CheckBox;\r
 import android.widget.EditText;\r

-import android.widget.Button;\r
-import android.widget.ImageView;\r

 import android.widget.TextView;\r
 import android.widget.TextView;\r

+import android.widget.TextView.OnEditorActionListener;\r

 import android.widget.Toast;\r
 \r
 import android.widget.Toast;\r
 \r

+import com.owncloud.android.Log_OC;\r

 import com.owncloud.android.R;\r
 import com.owncloud.android.R;\r

+import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.operations.ExistenceCheckOperation;\r
+import com.owncloud.android.operations.OAuth2GetAccessToken;\r
+import com.owncloud.android.operations.OnRemoteOperationListener;\r
+import com.owncloud.android.operations.OwnCloudServerCheckOperation;\r
+import com.owncloud.android.operations.RemoteOperation;\r
+import com.owncloud.android.operations.RemoteOperationResult;\r
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
+import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
+import com.owncloud.android.utils.OwnCloudVersion;\r

 \r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 \r
 import eu.alefzero.webdav.WebdavClient;\r
 \r


@@ -68,7 +75,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 {\r
+implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener, SsoWebViewClientListener{\r

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


@@ -76,21 +83,26 @@ 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
+    public static final String EXTRA_ENFORCED_UPDATE = "ENFORCE_UPDATE";\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

-    private static final String KEY_STATUS_TEXT = "STATUS_TEXT";\r
-    private static final String KEY_STATUS_ICON = "STATUS_ICON";\r
-    private static final String KEY_STATUS_CORRECT = "STATUS_CORRECT";\r
+    private static final String KEY_SERVER_VALID = "SERVER_VALID";\r
+    private static final String KEY_SERVER_CHECKED = "SERVER_CHECKED";\r
+    private static final String KEY_SERVER_CHECK_IN_PROGRESS = "SERVER_CHECK_IN_PROGRESS"; \r
+    private static final String KEY_SERVER_STATUS_TEXT = "SERVER_STATUS_TEXT";\r
+    private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON";\r

     private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r
     private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r

-    private static final String KEY_OAUTH2_STATUS_TEXT = "OAUTH2_STATUS_TEXT";\r
-    private static final String KEY_OAUTH2_STATUS_ICON = "OAUTH2_STATUS_ICON";\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 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_REFRESH_BUTTON_ENABLED = "KEY_REFRESH_BUTTON_ENABLED";\r

 \r
 \r

+    private static final String AUTH_ON = "on";\r
+    private static final String AUTH_OFF = "off";\r
+    private static final String AUTH_OPTIONAL = "optional";\r
+    \r

     private static final int DIALOG_LOGIN_PROGRESS = 0;\r
     private static final int DIALOG_SSL_VALIDATOR = 1;\r
     private static final int DIALOG_CERT_NOT_SAVED = 2;\r
     private static final int DIALOG_LOGIN_PROGRESS = 0;\r
     private static final int DIALOG_SSL_VALIDATOR = 1;\r
     private static final int DIALOG_CERT_NOT_SAVED = 2;\r


@@ -99,14 +111,16 @@ 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

+    private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r

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

-    \r
-    private int mStatusText, mStatusIcon;\r
-    private boolean mStatusCorrect, mIsSslConn;\r
-    private int mOAuth2StatusText, mOAuth2StatusIcon;    \r
-    \r
+\r
+    private int mServerStatusText, mServerStatusIcon;\r
+    private boolean mServerIsChecked, mServerIsValid, mIsSslConn;\r
+    private int mAuthStatusText, mAuthStatusIcon;    \r
+    private TextView mAuthStatusLayout;\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


@@ -114,26 +128,34 @@ 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
-    private ImageView mRefreshButton;\r
-    private ImageView mViewPasswordButton;\r
+\r

     private EditText mHostUrlInput;\r
     private EditText mHostUrlInput;\r

+    private boolean mHostUrlInputEnabled;\r
+    private View mRefreshButton;\r
+\r
+    private String mCurrentAuthTokenType;\r
+    \r

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

+    \r

     private CheckBox mOAuth2Check;\r
     private CheckBox mOAuth2Check;\r

-    private String mOAuthAccessToken;\r
-    private View mOkButton;\r
-    private TextView mAuthStatusLayout;\r

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

+    private TextView mAccountNameInput;\r
+    private SamlWebViewDialog mSamlDialog;\r

     \r
     \r

+    private View mOkButton;\r
+    \r
+    private String mAuthToken;\r
+\r
+\r

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


@@ -143,84 +165,208 @@ 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
         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r

-        mRefreshButton = (ImageView) findViewById(R.id.refreshButton);\r
-        mViewPasswordButton = (ImageView) findViewById(R.id.viewPasswordButton);\r

         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r

+        mHostUrlInput.setText(getString(R.string.server_url));  // valid although R.string.server_url is an empty string\r

         mUsernameInput = (EditText) findViewById(R.id.account_username);\r
         mPasswordInput = (EditText) findViewById(R.id.account_password);\r
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mUsernameInput = (EditText) findViewById(R.id.account_username);\r
         mPasswordInput = (EditText) findViewById(R.id.account_password);\r
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r

+        mAccountNameInput = (EditText) findViewById(R.id.account_name);\r

         mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r

+        /// set Host Url Input Enabled\r
+        mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);\r
+        \r
+\r

         /// complete label for 'register account' button\r
         Button b = (Button) findViewById(R.id.account_register);\r
         if (b != null) {\r
             b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
         }\r
 \r
         /// complete label for 'register account' button\r
         Button b = (Button) findViewById(R.id.account_register);\r
         if (b != null) {\r
             b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
         }\r
 \r

-        /// bind view elements to listeners\r
-        mHostUrlInput.setOnFocusChangeListener(this);\r
-        mPasswordInput.setOnFocusChangeListener(this);\r
-        \r

         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r
         mNewCapturedUriFromOAuth2Redirection = null;\r
         mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); \r
         mAccount = null;\r
         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r
         mNewCapturedUriFromOAuth2Redirection = null;\r
         mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); \r
         mAccount = null;\r

+        mHostBaseUrl = "";\r
+        boolean refreshButtonEnabled = false;\r
+        \r
+        // URL input configuration applied\r
+        if (!mHostUrlInputEnabled)\r
+        {\r
+            findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);\r
+            mRefreshButton = findViewById(R.id.centeredRefreshButton);\r
+\r
+        } else {\r
+            mRefreshButton = findViewById(R.id.embeddedRefreshButton);\r
+        }\r

 \r
         if (savedInstanceState == null) {\r
             /// connection state and info\r
 \r
         if (savedInstanceState == null) {\r
             /// connection state and info\r

-            mStatusText = mStatusIcon = 0;\r
-            mStatusCorrect = false;\r
+            mServerStatusText = mServerStatusIcon = 0;\r
+            mServerIsValid = false;\r
+            mServerIsChecked = false;\r

             mIsSslConn = false;\r
             mIsSslConn = false;\r

-            updateConnStatus();\r
-            updateAuthStatus();\r
-            \r
+            mAuthStatusText = mAuthStatusIcon = 0;\r
+\r

             /// retrieve extras from intent\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

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

-                mHostBaseUrl = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
+                mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL));\r

                 mHostUrlInput.setText(mHostBaseUrl);\r
                 mHostUrlInput.setText(mHostBaseUrl);\r

-                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
-                mUsernameInput.setText(userName);\r
-                oAuthRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r

             }\r
             }\r

-            mOAuth2Check.setChecked(oAuthRequired);\r
-            changeViewByOAuth2Check(oAuthRequired);\r
+            initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
+            mJustCreated = true;\r
+            \r
+            if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r
+                checkOcServer(); \r
+            }\r

             \r
             \r

-\r

         } else {\r
         } else {\r

-            loadSavedInstanceState(savedInstanceState);\r
-        }\r
-        \r
-        if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {\r
-            mOAuth2Check.setVisibility(View.GONE);\r
+            /// connection state and info\r
+            mServerIsValid = savedInstanceState.getBoolean(KEY_SERVER_VALID);\r
+            mServerIsChecked = savedInstanceState.getBoolean(KEY_SERVER_CHECKED);\r
+            mServerStatusText = savedInstanceState.getInt(KEY_SERVER_STATUS_TEXT);\r
+            mServerStatusIcon = savedInstanceState.getInt(KEY_SERVER_STATUS_ICON);\r
+            mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);\r
+            mAuthStatusText = savedInstanceState.getInt(KEY_AUTH_STATUS_TEXT);\r
+            mAuthStatusIcon = savedInstanceState.getInt(KEY_AUTH_STATUS_ICON);\r
+            if (savedInstanceState.getBoolean(KEY_PASSWORD_VISIBLE, false)) {\r
+                showPassword();\r
+            }\r
+            \r
+            /// server data\r
+            String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
+            if (ocVersion != null) {\r
+                mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
+            }\r
+            mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r
+\r
+            // account data, if updating\r
+            mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
+            mCurrentAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
+            if (mCurrentAuthTokenType == null) {\r
+                mCurrentAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
+                \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
+            \r
+            // refresh button enabled\r
+            refreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);\r
+            \r
+\r

         }\r
         }\r

+\r
+        adaptViewAccordingToAuthenticationMethod();\r
+        showServerStatus();\r
+        showAuthStatus();\r

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

+            mHostUrlInput.setFocusable(false);\r

             mUsernameInput.setEnabled(false);\r
             mUsernameInput.setEnabled(false);\r

+            mUsernameInput.setFocusable(false);\r

             mOAuth2Check.setVisibility(View.GONE);\r
             mOAuth2Check.setVisibility(View.GONE);\r

-            checkOcServer(); \r

         }\r
         \r
         }\r
         \r

+        //if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton();\r
+        if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\r
+        mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
+\r
+        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType) || \r
+                !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
+            mOAuth2Check.setVisibility(View.GONE);\r
+        }\r
+\r

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

-        mJustCreated = true;\r
+\r
+        /// bind view elements to listeners and other friends\r
+        mHostUrlInput.setOnFocusChangeListener(this);\r
+        mHostUrlInput.addTextChangedListener(new TextWatcher() {\r
+\r
+            @Override\r
+            public void afterTextChanged(Editable s) {\r
+                if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r
+                    mOkButton.setEnabled(false);\r
+                }\r
+            }\r
+\r
+            @Override\r
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}\r
+\r
+            @Override\r
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}\r
+\r
+        });\r
+        mPasswordInput.setOnFocusChangeListener(this);\r
+        mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);\r
+        mPasswordInput.setOnEditorActionListener(this);
+        mPasswordInput.setOnTouchListener(new RightDrawableOnTouchListener() {\r
+            @Override\r
+            public boolean onDrawableTouch(final MotionEvent event) {\r
+                if (event.getAction() == MotionEvent.ACTION_UP) {\r
+                    AuthenticatorActivity.this.onViewPasswordClick();\r
+                }\r
+                return true;\r
+            }\r
+        });\r
+        \r

     }\r
     }\r

+    \r
+   \r

 \r
 \r

+    private void initAuthorizationMethod() {\r
+        boolean oAuthRequired = false;\r
+        boolean samlWebSsoRequired = false;\r
+\r
+        mCurrentAuthTokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
+        mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
+        \r
+        // TODO could be a good moment to validate the received token type, if not null\r
+        \r
+        if (mCurrentAuthTokenType == null) {    \r
+            if (mAccount != null) {\r
+                /// same authentication method than the one used to create the account to update\r
+                oAuthRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r
+                samlWebSsoRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_SAML_WEB_SSO) != null);\r
+            \r
+            } else {\r
+                /// use the one set in setup.xml\r
+                oAuthRequired = AUTH_ON.equals(getString(R.string.auth_method_oauth2));\r
+                samlWebSsoRequired = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));            \r
+            }\r
+            if (oAuthRequired) {\r
+                mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
+            } else if (samlWebSsoRequired) {\r
+                mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;\r
+            } else {\r
+                mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
+            }\r
+        }\r
+    \r
+        if (mAccount != null) {\r
+            String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
+            mUsernameInput.setText(userName);\r
+        }\r
+        \r
+        mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType));\r
+        \r
+    }\r

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


@@ -233,67 +379,37 @@ 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
         /// connection state and info\r

-        outState.putInt(KEY_STATUS_TEXT, mStatusText);\r
-        outState.putInt(KEY_STATUS_ICON, mStatusIcon);\r
-        outState.putBoolean(KEY_STATUS_CORRECT, mStatusCorrect);\r
+        outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);\r
+        outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);\r
+        outState.putBoolean(KEY_SERVER_VALID, mServerIsValid);\r
+        outState.putBoolean(KEY_SERVER_CHECKED, mServerIsChecked);\r
+        outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerIsValid && mOcServerChkOperation != null));\r

         outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);\r
         outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);\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
         /// server data\r
 \r
         /// server data\r

-        if (mDiscoveredVersion != null) \r
+        if (mDiscoveredVersion != null) {\r

             outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());\r
             outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());\r

+        }\r

         outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r
         outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r

-        \r
+\r

         /// account data, if updating\r
         /// account data, if updating\r

-        if (mAccount != null)\r
+        if (mAccount != null) {\r

             outState.putParcelable(KEY_ACCOUNT, mAccount);\r
             outState.putParcelable(KEY_ACCOUNT, mAccount);\r

+        }\r
+        outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mCurrentAuthTokenType);\r

         \r
         \r

-        // Saving the state of oAuth2 components.\r
-        outState.putInt(KEY_OAUTH2_STATUS_ICON, mOAuth2StatusIcon);\r
-        outState.putInt(KEY_OAUTH2_STATUS_TEXT, mOAuth2StatusText);\r
+        // refresh button enabled\r
+        outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r

         \r
         \r

-    }\r
-\r

 \r
 \r

-    /**\r
-     * Loads saved state\r
-     * \r
-     * See {@link #onSaveInstanceState(Bundle)}.\r
-     * \r
-     * @param savedInstanceState    Saved state, as received in {@link #onCreate(Bundle)}.\r
-     */\r
-    private void loadSavedInstanceState(Bundle savedInstanceState) {\r
-        /// connection state and info\r
-        mStatusCorrect = savedInstanceState.getBoolean(KEY_STATUS_CORRECT);\r
-        mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);\r
-        mStatusText = savedInstanceState.getInt(KEY_STATUS_TEXT);\r
-        mStatusIcon = savedInstanceState.getInt(KEY_STATUS_ICON);\r
-        updateConnStatus();\r
-        \r
-        /// UI settings depending upon connection\r
-        mOkButton.setEnabled(mStatusCorrect);  \r
-        if (!mStatusCorrect)\r
-            mRefreshButton.setVisibility(View.VISIBLE); // seems that setting visibility is necessary\r
-        else\r
-            mRefreshButton.setVisibility(View.INVISIBLE);\r
-        \r
-        /// server data\r
-        String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
-        if (ocVersion != null)\r
-            mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
-        mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r
-        \r
-        // account data, if updating\r
-        mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
-        \r
-        // state of oAuth2 components\r
-        mOAuth2StatusIcon = savedInstanceState.getInt(KEY_OAUTH2_STATUS_ICON);\r
-        mOAuth2StatusText = savedInstanceState.getInt(KEY_OAUTH2_STATUS_TEXT);\r
-        // END of getting the state of oAuth2 components.\r

     }\r
 \r
     }\r
 \r

-    \r
+\r

     /**\r
      * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION request\r
      * is caught here.\r
     /**\r
      * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION request\r
      * is caught here.\r


@@ -310,7 +426,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


@@ -318,23 +434,22 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     @Override\r
     protected void onResume() {\r
         super.onResume();\r
     @Override\r
     protected void onResume() {\r
         super.onResume();\r

-        // the state of mOAuth2Check is automatically recovered between configuration changes, but not before onCreate() finishes; so keep the next lines here\r
-        changeViewByOAuth2Check(mOAuth2Check.isChecked());  \r
-        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated) {\r
+        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {\r

             if (mOAuth2Check.isChecked())\r
                 Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
             else\r
                 Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
         }\r
             if (mOAuth2Check.isChecked())\r
                 Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\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
         mJustCreated = false;\r

+        \r

     }\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


@@ -343,34 +458,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(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());\r

-        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext());\r
+        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext(), true);\r

         operation.execute(client, this, mHandler);\r
     }\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) {\r
-            onUrlInputFocusChanged((TextView) view, hasFocus);\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


@@ -382,39 +502,42 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * When hasFocus:    user 'comes back' to write again the server URL.\r
      * \r
      * @param hostInput     TextView with the URL input field receiving the change of focus.\r
      * When hasFocus:    user 'comes back' to write again the server URL.\r
      * \r
      * @param hostInput     TextView with the URL input field receiving the change of focus.\r

-     * @param hasFocus      'True' if focus is received, 'false' if is lost\r

      */\r
      */\r

-    private void onUrlInputFocusChanged(TextView hostInput, boolean hasFocus) {\r
-        if (!hasFocus) {\r
+    private void onUrlInputFocusLost(TextView hostInput) {\r
+        if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r

             checkOcServer();\r
             checkOcServer();\r

-            \r

         } else {\r
         } else {\r

-            // avoids that the 'connect' button can be clicked if the test was previously passed\r
-            mOkButton.setEnabled(false); \r
+            mOkButton.setEnabled(mServerIsValid);\r
+            if (!mServerIsValid) {\r
+                showRefreshButton();\r
+            }\r

         }\r
     }\r
 \r
 \r
     private void checkOcServer() {\r
         }\r
     }\r
 \r
 \r
     private void checkOcServer() {\r

-        String uri = mHostUrlInput.getText().toString().trim();\r
+        String uri = trimUrlWebdav(mHostUrlInput.getText().toString().trim());\r
+        \r
+        if (!mHostUrlInputEnabled){\r
+            uri = getString(R.string.server_url);\r
+        }\r
+        \r
+        mServerIsValid = false;\r
+        mServerIsChecked = false;\r
+        mOkButton.setEnabled(false);\r
+        mDiscoveredVersion = null;\r
+        hideRefreshButton();\r

         if (uri.length() != 0) {\r
         if (uri.length() != 0) {\r

-            mStatusText = R.string.auth_testing_connection;\r
-            mStatusIcon = R.drawable.progress_small;\r
-            updateConnStatus();\r
-            /** TODO cancel previous connection check if the user tries to ammend a wrong URL  \r
-            if(mConnChkOperation != null) {\r
-                mConnChkOperation.cancel();\r
-            } */\r
+            mServerStatusText = R.string.auth_testing_connection;\r
+            mServerStatusIcon = R.drawable.progress_small;\r
+            showServerStatus();\r

             mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);\r
             mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);\r

-            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);\r
-            mHostBaseUrl = "";\r
-            mDiscoveredVersion = null;\r
+            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this, true);\r

             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);\r
         } else {\r
             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);\r
         } else {\r

-            mRefreshButton.setVisibility(View.INVISIBLE);\r
-            mStatusText = 0;\r
-            mStatusIcon = 0;\r
-            updateConnStatus();\r
+            mServerStatusText = 0;\r
+            mServerStatusIcon = 0;\r
+            showServerStatus();\r

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


@@ -431,15 +554,42 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */\r
     private void onPasswordFocusChanged(TextView passwordInput, boolean hasFocus) {\r
         if (hasFocus) {\r
      */\r
     private void onPasswordFocusChanged(TextView passwordInput, boolean hasFocus) {\r
         if (hasFocus) {\r

-            mViewPasswordButton.setVisibility(View.VISIBLE);\r
+            showViewPasswordButton();\r

         } else {\r
         } else {\r

-            int input_type = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
-            passwordInput.setInputType(input_type);\r
-            mViewPasswordButton.setVisibility(View.INVISIBLE);\r
+            hidePassword();\r
+            hidePasswordButton();\r

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

+    private void showViewPasswordButton() {\r
+        //int drawable = android.R.drawable.ic_menu_view;\r
+        int drawable = R.drawable.ic_view;\r
+        if (isPasswordVisible()) {\r
+            //drawable = android.R.drawable.ic_secure;\r
+            drawable = R.drawable.ic_hide;\r
+        }\r
+        mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, drawable, 0);\r
+    }\r
+\r
+    private boolean isPasswordVisible() {\r
+        return ((mPasswordInput.getInputType() & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
+    }\r
+    \r
+    private void hidePasswordButton() {\r
+        mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
+    }\r
+\r
+    private void showPassword() {\r
+        mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
+        showViewPasswordButton();\r
+    }\r
+    \r
+    private void hidePassword() {\r
+        mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
+        showViewPasswordButton();\r
+    }\r
+    \r

     \r
     /**\r
      * Cancels the authenticator activity\r
     \r
     /**\r
      * Cancels the authenticator activity\r


@@ -454,9 +604,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


@@ -474,41 +624,42 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public void onOkClick(View view) {\r
         // this check should be unnecessary\r
         if (mDiscoveredVersion == null || !mDiscoveredVersion.isVersionValid()  || mHostBaseUrl == null || mHostBaseUrl.length() == 0) {\r
     public void onOkClick(View view) {\r
         // this check should be unnecessary\r
         if (mDiscoveredVersion == null || !mDiscoveredVersion.isVersionValid()  || mHostBaseUrl == null || mHostBaseUrl.length() == 0) {\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_wtf_reenter_URL;\r
-            updateConnStatus();\r
+            mServerStatusIcon = R.drawable.common_error;\r
+            mServerStatusText = R.string.auth_wtf_reenter_URL;\r
+            showServerStatus();\r

             mOkButton.setEnabled(false);\r
             Log_OC.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r
             return;\r
         }\r
             mOkButton.setEnabled(false);\r
             Log_OC.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r
             return;\r
         }\r

-        \r
-        if (mOAuth2Check.isChecked()) {\r
+\r
+        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) {\r

             startOauthorization();\r
             startOauthorization();\r

-            \r
+        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) { \r
+            startSamlBasedFederatedSingleSignOnAuthorization();\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
     private void checkBasicAuthorization() {\r
         /// get the path to the root folder through WebDAV from the version 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
      */\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
+        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\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
         /// test credentials accessing the root folder\r
         mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r

-        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
+        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);\r

         client.setBasicCredentials(username, password);\r
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
     }\r
         client.setBasicCredentials(username, password);\r
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
     }\r


@@ -520,10 +671,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */\r
     private void startOauthorization() {\r
         // be gentle with the user\r
      */\r
     private void startOauthorization() {\r
         // be gentle with the user\r

-        mStatusIcon = R.drawable.progress_small;\r
-        mStatusText = R.string.oauth_login_connection;\r
-        updateAuthStatus();\r
+        mAuthStatusIcon = R.drawable.progress_small;\r
+        mAuthStatusText = R.string.oauth_login_connection;\r
+        showAuthStatus();\r

         \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


@@ -539,7 +691,27 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         startActivity(i);\r
     }\r
 \r
         startActivity(i);\r
     }\r
 \r

-    \r
+\r
+    /**\r
+     * Starts the Web Single Sign On flow to get access to the root folder\r
+     * in the server.\r
+     */\r
+    private void startSamlBasedFederatedSingleSignOnAuthorization() {\r
+        // be gentle with the user\r
+        mAuthStatusIcon = R.drawable.progress_small;\r
+        mAuthStatusText = R.string.auth_connecting_auth_server;\r
+        showAuthStatus();\r
+        showDialog(DIALOG_LOGIN_PROGRESS);\r
+        \r
+        /// get the path to the root folder through WebDAV from the version server\r
+        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\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, false);\r
+        mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\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


@@ -550,16 +722,47 @@ 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
         } else if (operation instanceof ExistenceCheckOperation)  {\r

-            onAuthorizationCheckFinish((ExistenceCheckOperation)operation, result);\r
+            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
+                onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);\r

                 \r
                 \r

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

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

+    \r
+    private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperation operation, RemoteOperationResult result) {\r
+        try {\r
+            dismissDialog(DIALOG_LOGIN_PROGRESS);\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
+        if (result.isTemporalRedirection() || result.isIdPRedirection()) {\r
+            String url = result.getRedirectedLocation();\r
+            String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
+            \r
+            // Show dialog\r
+            mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
+            mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);\r
+            \r
+            mAuthStatusIcon = android.R.drawable.ic_secure;\r
+            mAuthStatusText = R.string.auth_follow_auth_server;\r
+            \r
+        } else {\r
+            mAuthStatusIcon = R.drawable.common_error;\r
+            mAuthStatusText = R.string.auth_unsupported_auth_method;\r
+            \r
+        }\r
+        showAuthStatus();\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


@@ -569,135 +772,227 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param result        Result of the check.\r
      */\r
     private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) {\r
      * @param result        Result of the check.\r
      */\r
     private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) {\r

-        /// update status icon and text\r
-        updateStatusIconAndText(result);\r
-        updateConnStatus();\r
+        if (operation.equals(mOcServerChkOperation)) {\r
+            /// save result state\r
+            mServerIsChecked = true;\r
+            mServerIsValid = result.isSuccess();\r
+            mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
+            mOcServerChkOperation = null;\r

 \r
 \r

-        /// save result state\r
-        mStatusCorrect = result.isSuccess();\r
-        mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\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
-        /// update the visibility of the 'retry connection' button\r
-        if (!mStatusCorrect)\r
-            mRefreshButton.setVisibility(View.VISIBLE);\r
-        else\r
-            mRefreshButton.setVisibility(View.INVISIBLE);\r
-        \r
-        /// retrieve discovered version and normalize server URL\r
-        mDiscoveredVersion = operation.getDiscoveredVersion();\r
-        mHostBaseUrl = mHostUrlInput.getText().toString().trim();\r
-        if (!mHostBaseUrl.toLowerCase().startsWith("http://") &&\r
-            !mHostBaseUrl.toLowerCase().startsWith("https://")) {\r
-            \r
-            if (mIsSslConn) {\r
-                mHostBaseUrl = "https://" + mHostBaseUrl;\r
+            /// update status icon and text\r
+            if (mServerIsValid) {\r
+                hideRefreshButton();\r

             } else {\r
             } else {\r

-                mHostBaseUrl = "http://" + mHostBaseUrl;\r
+                showRefreshButton();\r

             }\r
             }\r

-            \r
+            updateServerStatusIconAndText(result);\r
+            showServerStatus();\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
+            /// retrieve discovered version and normalize server URL\r
+            mDiscoveredVersion = operation.getDiscoveredVersion();\r
+            mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
+\r
+            /// allow or not the user try to access the server\r
+            mOkButton.setEnabled(mServerIsValid);\r
+\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
+    }\r
+\r
+\r
+    private String normalizeUrl(String url) {\r
+        if (url != null && url.length() > 0) {\r
+            url = url.trim();\r
+            if (!url.toLowerCase().startsWith("http://") &&\r
+                    !url.toLowerCase().startsWith("https://")) {\r
+                if (mIsSslConn) {\r
+                    url = "https://" + url;\r
+                } else {\r
+                    url = "http://" + url;\r
+                }\r
+            }\r
+\r
+            // OC-208: Add suffix remote.php/webdav to normalize (OC-34)            \r
+            url = trimUrlWebdav(url);\r
+\r
+            if (url.endsWith("/")) {\r
+                url = url.substring(0, url.length() - 1);\r
+            }\r
+\r

         }\r
         }\r

-        if (mHostBaseUrl.endsWith("/"))\r
-            mHostBaseUrl = mHostBaseUrl.substring(0, mHostBaseUrl.length() - 1);\r
-        \r
-        /// allow or not the user try to access the server\r
-        mOkButton.setEnabled(mStatusCorrect);\r
+        Log_OC.d(TAG, "URL Normalize " + url);\r
+        return (url != null ? url : "");\r

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

+    private String trimUrlWebdav(String url){       \r
+        if(url.toLowerCase().endsWith(AccountUtils.WEBDAV_PATH_4_0)){\r
+            url = url.substring(0, url.length() - AccountUtils.WEBDAV_PATH_4_0.length());             \r
+        } else if(url.toLowerCase().endsWith(AccountUtils.WEBDAV_PATH_2_0)){\r
+            url = url.substring(0, url.length() - AccountUtils.WEBDAV_PATH_2_0.length());             \r
+        } else if (url.toLowerCase().endsWith(AccountUtils.WEBDAV_PATH_1_2)){\r
+            url = url.substring(0, url.length() - AccountUtils.WEBDAV_PATH_1_2.length());             \r
+        } \r
+        return (url != null ? url : "");\r
+    }\r
+    \r
+    \r

     /**\r
      * Chooses the right icon and text to show to the user for the received operation result.\r
      * \r
      * @param result    Result of a remote operation performed in this activity\r
      */\r
     /**\r
      * Chooses the right icon and text to show to the user for the received operation result.\r
      * \r
      * @param result    Result of a remote operation performed in this activity\r
      */\r

-    private void updateStatusIconAndText(RemoteOperationResult result) {\r
-        mStatusText = mStatusIcon = 0;\r
+    private void updateServerStatusIconAndText(RemoteOperationResult result) {\r
+        mServerStatusIcon = R.drawable.common_error;    // the most common case in the switch below\r

 \r
         switch (result.getCode()) {\r
         case OK_SSL:\r
 \r
         switch (result.getCode()) {\r
         case OK_SSL:\r

-            mStatusIcon = android.R.drawable.ic_secure;\r
-            mStatusText = R.string.auth_secure_connection;\r
+            mServerStatusIcon = android.R.drawable.ic_secure;\r
+            mServerStatusText = R.string.auth_secure_connection;\r

             break;\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

-                mStatusText = R.string.auth_connection_established;\r
-                mStatusIcon = R.drawable.ic_ok;\r
+                mServerStatusText = R.string.auth_connection_established;\r
+                mServerStatusIcon = R.drawable.ic_ok;\r

             } else {\r
             } else {\r

-                mStatusText = R.string.auth_nossl_plain_ok_title;\r
-                mStatusIcon = android.R.drawable.ic_partial_secure;\r
+                mServerStatusText = R.string.auth_nossl_plain_ok_title;\r
+                mServerStatusIcon = android.R.drawable.ic_partial_secure;\r

             }\r
             break;\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
+\r

         case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
         case SSL_RECOVERABLE_PEER_UNVERIFIED:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_ssl_unverified_server_title;\r
+            mServerStatusText = R.string.auth_ssl_unverified_server_title;\r

             break;\r
             break;\r

-                \r

         case BAD_OC_VERSION:\r
         case BAD_OC_VERSION:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_bad_oc_version_title;\r
+            mServerStatusText = R.string.auth_bad_oc_version_title;\r

             break;\r
         case WRONG_CONNECTION:\r
             break;\r
         case WRONG_CONNECTION:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_wrong_connection_title;\r
+            mServerStatusText = R.string.auth_wrong_connection_title;\r

             break;\r
         case TIMEOUT:\r
             break;\r
         case TIMEOUT:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_timeout_title;\r
+            mServerStatusText = R.string.auth_timeout_title;\r

             break;\r
         case INCORRECT_ADDRESS:\r
             break;\r
         case INCORRECT_ADDRESS:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_incorrect_address_title;\r
+            mServerStatusText = R.string.auth_incorrect_address_title;\r

             break;\r
             break;\r

-            \r

         case SSL_ERROR:\r
         case SSL_ERROR:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_ssl_general_error_title;\r
+            mServerStatusText = R.string.auth_ssl_general_error_title;\r

             break;\r
             break;\r

-            \r

         case UNAUTHORIZED:\r
         case UNAUTHORIZED:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_unauthorized;\r
+            mServerStatusText = R.string.auth_unauthorized;\r

             break;\r
         case HOST_NOT_AVAILABLE:\r
             break;\r
         case HOST_NOT_AVAILABLE:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_unknown_host_title;\r
+            mServerStatusText = R.string.auth_unknown_host_title;\r
+            break;\r
+        case INSTANCE_NOT_CONFIGURED:\r
+            mServerStatusText = R.string.auth_not_configured_title;\r
+            break;\r
+        case FILE_NOT_FOUND:\r
+            mServerStatusText = R.string.auth_incorrect_path_title;\r

             break;\r
             break;\r

+        case OAUTH2_ERROR:\r
+            mServerStatusText = R.string.auth_oauth_error;\r
+            break;\r
+        case OAUTH2_ERROR_ACCESS_DENIED:\r
+            mServerStatusText = R.string.auth_oauth_error_access_denied;\r
+            break;\r
+        case UNHANDLED_HTTP_CODE:\r
+        case UNKNOWN_ERROR:\r
+            mServerStatusText = R.string.auth_unknown_error_title;\r
+            break;\r
+        default:\r
+            mServerStatusText = 0;\r
+            mServerStatusIcon = 0;\r
+        }\r
+    }\r
+\r
+\r
+    /**\r
+     * Chooses the right icon and text to show to the user for the received operation result.\r
+     * \r
+     * @param result    Result of a remote operation performed in this activity\r
+     */\r
+    private void updateAuthStatusIconAndText(RemoteOperationResult result) {\r
+        mAuthStatusIcon = R.drawable.common_error;    // the most common case in the switch below\r
+\r
+        switch (result.getCode()) {\r
+        case OK_SSL:\r
+            mAuthStatusIcon = android.R.drawable.ic_secure;\r
+            mAuthStatusText = R.string.auth_secure_connection;\r
+            break;\r
+\r
+        case OK_NO_SSL:\r
+        case OK:\r
+            if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r
+                mAuthStatusText = R.string.auth_connection_established;\r
+                mAuthStatusIcon = R.drawable.ic_ok;\r
+            } else {\r
+                mAuthStatusText = R.string.auth_nossl_plain_ok_title;\r
+                mAuthStatusIcon = android.R.drawable.ic_partial_secure;\r
+            }\r
+            break;\r
+\r

         case NO_NETWORK_CONNECTION:\r
         case NO_NETWORK_CONNECTION:\r

-            mStatusIcon = R.drawable.no_network;\r
-            mStatusText = R.string.auth_no_net_conn_title;\r
+            mAuthStatusIcon = R.drawable.no_network;\r
+            mAuthStatusText = R.string.auth_no_net_conn_title;\r
+            break;\r
+\r
+        case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
+            mAuthStatusText = R.string.auth_ssl_unverified_server_title;\r
+            break;\r
+        case BAD_OC_VERSION:\r
+            mAuthStatusText = R.string.auth_bad_oc_version_title;\r
+            break;\r
+        case WRONG_CONNECTION:\r
+            mAuthStatusText = R.string.auth_wrong_connection_title;\r
+            break;\r
+        case TIMEOUT:\r
+            mAuthStatusText = R.string.auth_timeout_title;\r
+            break;\r
+        case INCORRECT_ADDRESS:\r
+            mAuthStatusText = R.string.auth_incorrect_address_title;\r
+            break;\r
+        case SSL_ERROR:\r
+            mAuthStatusText = R.string.auth_ssl_general_error_title;\r
+            break;\r
+        case UNAUTHORIZED:\r
+            mAuthStatusText = R.string.auth_unauthorized;\r
+            break;\r
+        case HOST_NOT_AVAILABLE:\r
+            mAuthStatusText = R.string.auth_unknown_host_title;\r

             break;\r
         case INSTANCE_NOT_CONFIGURED:\r
             break;\r
         case INSTANCE_NOT_CONFIGURED:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_not_configured_title;\r
+            mAuthStatusText = R.string.auth_not_configured_title;\r

             break;\r
         case FILE_NOT_FOUND:\r
             break;\r
         case FILE_NOT_FOUND:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_incorrect_path_title;\r
+            mAuthStatusText = R.string.auth_incorrect_path_title;\r

             break;\r
         case OAUTH2_ERROR:\r
             break;\r
         case OAUTH2_ERROR:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_oauth_error;\r
+            mAuthStatusText = R.string.auth_oauth_error;\r

             break;\r
         case OAUTH2_ERROR_ACCESS_DENIED:\r
             break;\r
         case OAUTH2_ERROR_ACCESS_DENIED:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_oauth_error_access_denied;\r
+            mAuthStatusText = R.string.auth_oauth_error_access_denied;\r

             break;\r
         case UNHANDLED_HTTP_CODE:\r
         case UNKNOWN_ERROR:\r
             break;\r
         case UNHANDLED_HTTP_CODE:\r
         case UNKNOWN_ERROR:\r

-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_unknown_error_title;\r
+            mAuthStatusText = R.string.auth_unknown_error_title;\r

             break;\r
             break;\r

-            \r

         default:\r
         default:\r

-            break;\r
+            mAuthStatusText = 0;\r
+            mAuthStatusIcon = 0;\r

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


@@ -716,27 +1011,27 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             // 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
             // 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

-        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, true);\r
+        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r

         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
             /// 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
+            mAuthToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Constants.KEY_ACCESS_TOKEN);\r
+            Log_OC.d(TAG, "Got ACCESS TOKEN: " + mAuthToken);\r

             mAuthCheckOperation = new ExistenceCheckOperation("", this, false);\r
             mAuthCheckOperation = new ExistenceCheckOperation("", this, false);\r

-            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
-            client.setBearerCredentials(mOAuthAccessToken);\r
+            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);\r
+            client.setBearerCredentials(mAuthToken);\r

             mAuthCheckOperation.execute(client, this, mHandler);\r
             mAuthCheckOperation.execute(client, this, mHandler);\r

-            \r
+\r

         } else {\r
         } else {\r

-            updateStatusIconAndText(result);\r
-            updateAuthStatus();\r
+            updateAuthStatusIconAndText(result);\r
+            showAuthStatus();\r

             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r
     }\r
 \r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\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


@@ -751,27 +1046,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
-            updateStatusIconAndText(result);\r
-            updateAuthStatus();\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
             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


@@ -780,11 +1101,17 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         Bundle response = new Bundle();\r
         response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
         response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
         Bundle response = new Bundle();\r
         response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
         response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r

-        boolean isOAuth = mOAuth2Check.isChecked();\r
-        if (isOAuth) {\r
-            response.putString(AccountManager.KEY_AUTHTOKEN, mOAuthAccessToken);\r
+        \r
+        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) { \r
+            response.putString(AccountManager.KEY_AUTHTOKEN, mAuthToken);\r
+            // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
+            mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r
+            \r
+        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
+            response.putString(AccountManager.KEY_AUTHTOKEN, mAuthToken);\r

             // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
             // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r

-            mAccountMgr.setAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, mOAuthAccessToken);\r
+            mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r
+            \r

         } else {\r
             response.putString(AccountManager.KEY_AUTHTOKEN, mPasswordInput.getText().toString());\r
             mAccountMgr.setPassword(mAccount, mPasswordInput.getText().toString());\r
         } else {\r
             response.putString(AccountManager.KEY_AUTHTOKEN, mPasswordInput.getText().toString());\r
             mAccountMgr.setPassword(mAccount, mPasswordInput.getText().toString());\r


@@ -802,11 +1129,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */\r
     private void createAccount() {\r
         /// create and save new ownCloud account\r
      */\r
     private void createAccount() {\r
         /// create and save new ownCloud account\r

-        boolean isOAuth = mOAuth2Check.isChecked();\r
-        \r
+        boolean isOAuth = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType);\r
+        boolean isSaml =  AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType);\r
+\r

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

-        if (isOAuth) {\r
+        if (isSaml) {\r
+            username = mAccountNameInput.getText().toString().trim();\r
+            \r
+        } else if (isOAuth) {\r

             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r
         }            \r
         String accountName = username + "@" + uri.getHost();\r
             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r
         }            \r
         String accountName = username + "@" + uri.getHost();\r


@@ -814,8 +1145,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             accountName += ":" + uri.getPort();\r
         }\r
         mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);\r
             accountName += ":" + uri.getPort();\r
         }\r
         mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);\r

-        if (isOAuth) {\r
-            mAccountMgr.addAccountExplicitly(mAccount, "", null);  // with our implementation, the password is never input in the app\r
+        if (isOAuth || isSaml) {\r
+            mAccountMgr.addAccountExplicitly(mAccount, "", null);  // with external authorizations, the password is never input in the app\r

         } else {\r
             mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);\r
         }\r
         } else {\r
             mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);\r
         }\r


@@ -834,21 +1165,24 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         final Intent intent = new Intent();       \r
         intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);\r
         intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);\r
         final Intent intent = new Intent();       \r
         intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);\r
         intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);\r

-        if (!isOAuth)\r
-            intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); // TODO check this; not sure it's right; maybe\r
+        /*if (!isOAuth)\r
+            intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); */\r

         intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
         intent.putExtra(AccountManager.KEY_USERDATA,        username);\r

-        if (isOAuth) {\r
-            mAccountMgr.setAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, mOAuthAccessToken);\r
+        if (isOAuth || isSaml) {\r
+            mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r

         }\r
         /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());\r
         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);\r
         }\r
         /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());\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
+        if (isSaml) {\r
+            mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); \r
+        } else if (isOAuth) {\r
+            mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  \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


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

-    \r
+\r

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


@@ -894,17 +1228,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


@@ -934,11 +1268,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


@@ -948,7 +1282,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


@@ -960,39 +1294,50 @@ 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
     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the last check on the ownCloud server.\r
      */\r

-    private void updateConnStatus() {\r
+    private void showServerStatus() {\r

         TextView tv = (TextView) findViewById(R.id.server_status_text);\r
 \r
         TextView tv = (TextView) findViewById(R.id.server_status_text);\r
 \r

-        if (mStatusIcon == 0 && mStatusText == 0) {\r
+        if (mServerStatusIcon == 0 && mServerStatusText == 0) {\r

             tv.setVisibility(View.INVISIBLE);\r
             tv.setVisibility(View.INVISIBLE);\r

+\r

         } else {\r
         } else {\r

-            tv.setText(mStatusText);\r
-            tv.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);\r
+            tv.setText(mServerStatusText);\r
+            tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);\r

             tv.setVisibility(View.VISIBLE);\r
         }\r
             tv.setVisibility(View.VISIBLE);\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
     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the interactions with the OAuth authorization server.\r
      */\r

-    private void updateAuthStatus() {\r
-        if (mStatusIcon == 0 && mStatusText == 0) {\r
+    private void showAuthStatus() {\r
+        if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {\r

             mAuthStatusLayout.setVisibility(View.INVISIBLE);\r
             mAuthStatusLayout.setVisibility(View.INVISIBLE);\r

+\r

         } else {\r
         } else {\r

-            mAuthStatusLayout.setText(mStatusText);\r
-            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);\r
+            mAuthStatusLayout.setText(mAuthStatusText);\r
+            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);\r

             mAuthStatusLayout.setVisibility(View.VISIBLE);\r
         }\r
     }     \r
 \r
             mAuthStatusLayout.setVisibility(View.VISIBLE);\r
         }\r
     }     \r
 \r

-    \r
+\r
+    private void showRefreshButton() {\r
+        mRefreshButton.setVisibility(View.VISIBLE);\r
+    }\r
+\r
+    private void hideRefreshButton() {\r
+        mRefreshButton.setVisibility(View.GONE);\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


@@ -1001,7 +1346,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param view      Refresh 'button'\r
      */\r
     public void onRefreshClick(View view) {\r
      * @param view      Refresh 'button'\r
      */\r
     public void onRefreshClick(View view) {\r

-        onFocusChange(mRefreshButton, false);\r
+        checkOcServer();\r

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


@@ -1009,25 +1354,19 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * Called when the eye icon in the password field is clicked.\r
      * \r
      * Toggles the visibility of the password in the field. \r
      * Called when the eye icon in the password field is clicked.\r
      * \r
      * Toggles the visibility of the password in the field. \r

-     * \r
-     * @param view      'View password' 'button'\r

      */\r
      */\r

-    public void onViewPasswordClick(View view) {\r
+    public void onViewPasswordClick() {\r

         int selectionStart = mPasswordInput.getSelectionStart();\r
         int selectionEnd = mPasswordInput.getSelectionEnd();\r
         int selectionStart = mPasswordInput.getSelectionStart();\r
         int selectionEnd = mPasswordInput.getSelectionEnd();\r

-        int input_type = mPasswordInput.getInputType();\r
-        if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {\r
-            input_type = InputType.TYPE_CLASS_TEXT\r
-                    | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
+        if (isPasswordVisible()) {\r
+            hidePassword();\r

         } else {\r
         } else {\r

-            input_type = InputType.TYPE_CLASS_TEXT\r
-                    | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
+            showPassword();\r

         }\r
         }\r

-        mPasswordInput.setInputType(input_type);\r

         mPasswordInput.setSelection(selectionStart, selectionEnd);\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


@@ -1036,40 +1375,51 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param view      'View password' 'button'\r
      */\r
     public void onCheckClick(View view) {\r
      * @param view      'View password' 'button'\r
      */\r
     public void onCheckClick(View view) {\r

-        CheckBox oAuth2Check = (CheckBox)view;      \r
-        changeViewByOAuth2Check(oAuth2Check.isChecked());\r
-\r
+        CheckBox oAuth2Check = (CheckBox)view;\r
+        if (oAuth2Check.isChecked()) {\r
+            mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
+        } else {\r
+            mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
+        }\r
+        adaptViewAccordingToAuthenticationMethod();\r

     }\r
     }\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
-     * @param checked       'True' when OAuth is selected.\r
+     * Changes the visibility of input elements depending on\r
+     * the current authorization method.\r

      */\r
      */\r

-    public void changeViewByOAuth2Check(Boolean checked) {\r
-        \r
-        if (checked) {\r
+    private void adaptViewAccordingToAuthenticationMethod () {\r
+        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) {\r
+            // OAuth 2 authorization\r

             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r

-            mViewPasswordButton.setVisibility(View.GONE);\r
+            mAccountNameInput.setVisibility(View.GONE);\r
+            \r
+        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
+            // SAML-based web Single Sign On\r
+            mOAuthAuthEndpointText.setVisibility(View.GONE);\r
+            mOAuthTokenEndpointText.setVisibility(View.GONE);\r
+            mUsernameInput.setVisibility(View.GONE);\r
+            mPasswordInput.setVisibility(View.GONE);\r
+            mAccountNameInput.setVisibility(View.VISIBLE);\r

         } else {\r
         } else {\r

+            // basic HTTP authorization\r

             mOAuthAuthEndpointText.setVisibility(View.GONE);\r
             mOAuthTokenEndpointText.setVisibility(View.GONE);\r
             mUsernameInput.setVisibility(View.VISIBLE);\r
             mPasswordInput.setVisibility(View.VISIBLE);\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r
             mOAuthTokenEndpointText.setVisibility(View.GONE);\r
             mUsernameInput.setVisibility(View.VISIBLE);\r
             mPasswordInput.setVisibility(View.VISIBLE);\r

-            mViewPasswordButton.setVisibility(View.INVISIBLE);\r
-        }     \r
-\r
-    }    \r
+            mAccountNameInput.setVisibility(View.GONE);\r
+        }\r
+    }\r

     \r
     /**\r
      * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
      */\r
     public void onSavedCertificate() {\r
     \r
     /**\r
      * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
      */\r
     public void onSavedCertificate() {\r

-        mOperationThread = mOcServerChkOperation.retry(this, mHandler);                \r
+        checkOcServer();\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -1081,4 +1431,92 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         showDialog(DIALOG_CERT_NOT_SAVED);\r
     }\r
 \r
         showDialog(DIALOG_CERT_NOT_SAVED);\r
     }\r
 \r

+\r
+    /**\r
+     *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
+     * \r
+     *  Used to trigger the authorization check when the user presses 'enter' after writing the password.\r
+     */\r
+    @Override\r
+    public boolean onEditorAction(TextView inputField, int actionId, KeyEvent event) {\r
+        if (inputField != null && inputField.equals(mPasswordInput) && \r
+                actionId == EditorInfo.IME_ACTION_DONE) {\r
+            if (mOkButton.isEnabled()) {\r
+                mOkButton.performClick();\r
+            }\r
+        }\r
+        return false;   // always return false to grant that the software keyboard is hidden anyway\r
+    }\r
+\r
+\r
+    private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {\r
+\r
+        private int fuzz = 75;\r
+        \r
+        /**\r
+         * {@inheritDoc}\r
+         */\r
+        @Override\r
+        public boolean onTouch(View view, MotionEvent event) {\r
+            Drawable rightDrawable = null;\r
+            if (view instanceof TextView) {\r
+                Drawable[] drawables = ((TextView)view).getCompoundDrawables();\r
+                if (drawables.length > 2) {\r
+                    rightDrawable = drawables[2];\r
+                }\r
+            }\r
+            if (rightDrawable != null) {\r
+                final int x = (int) event.getX();\r
+                final int y = (int) event.getY();\r
+                final Rect bounds = rightDrawable.getBounds();\r
+                if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz)\r
+                    && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) {\r
+                    \r
+                    return onDrawableTouch(event);\r
+                }\r
+            }\r
+            return false;\r
+        }\r
+\r
+        public abstract boolean onDrawableTouch(final MotionEvent event);\r
+    }\r
+\r
+\r
+    public void onSamlDialogSuccess(String sessionCookie){\r
+        mAuthToken = sessionCookie;\r
+        \r
+        if (sessionCookie != null && sessionCookie.length() > 0) {\r
+          Log_OC.d(TAG, "Successful SSO - time to save the account");\r
+          mAuthToken = sessionCookie;\r
+          if (mAction == ACTION_CREATE) {\r
+              createAccount();\r
+\r
+          } else {\r
+              updateToken();\r
+          }\r
+\r
+          finish();\r
+\r
+      }\r
+    }\r
+\r
+\r
+\r
+    @Override\r
+    public void onSsoFinished(String sessionCookie) {\r
+        //Toast.makeText(this, "got cookies: " + sessionCookie, Toast.LENGTH_LONG).show();\r
+\r
+        if (sessionCookie != null && sessionCookie.length() > 0) {\r
+            Log_OC.d(TAG, "Successful SSO - time to save the account");\r
+            onSamlDialogSuccess(sessionCookie);\r
+            finish();\r
+\r
+        } else { \r
+            // TODO - show fail\r
+            Log_OC.d(TAG, "SSO failed");\r
+        }\r
+    }\r
+    \r
+    \r
+\r

 }\r
 }\r