App adapted to replacement of OwnCloudClientMap for interface OwnCloudClientManager...

[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 ac71a59..32bbcdc 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -1,6 +1,6 @@
 /* ownCloud Android client application\r
  *   Copyright (C) 2012  Bartek Przybylski\r
 /* ownCloud Android client application\r
  *   Copyright (C) 2012  Bartek Przybylski\r

- *   Copyright (C) 2012-2013 ownCloud Inc.\r
+ *   Copyright (C) 2012-2014 ownCloud Inc.\r

  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License version 2,\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License version 2,\r


@@ -98,99 +98,85 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
 \r
 \r
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
 \r

-    public static final String EXTRA_ACCOUNT = "ACCOUNT";\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
     public static final String EXTRA_ACTION = "ACTION";\r

-    public static final String EXTRA_ENFORCED_UPDATE = "ENFORCE_UPDATE";\r
+    public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
+\r
+    private static final String KEY_AUTH_TOKEN_TYPE = "AUTH_TOKEN_TYPE";\r

 \r
 \r

-    private static final String KEY_AUTH_MESSAGE_VISIBILITY = "AUTH_MESSAGE_VISIBILITY";\r
-    private static final String KEY_AUTH_MESSAGE_TEXT = "AUTH_MESSAGE_TEXT";\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_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_SERVER_VALID = "SERVER_VALID";\r
     private static final String KEY_SERVER_CHECKED = "SERVER_CHECKED";\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_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_PASSWORD_VISIBLE = "PASSWORD_VISIBLE";\r
+    private static final String KEY_PASSWORD_EXPOSED = "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_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
-    private static final String KEY_SERVER_AUTH_METHOD = "KEY_SERVER_AUTH_METHOD";\r
-    private static final String KEY_DETECT_AUTH_OP_ID = "KEY_DETECT_AUTH_OP_ID";\r
+    private static final String KEY_SERVER_AUTH_METHOD = "SERVER_AUTH_METHOD";\r
+    private static final String KEY_WAITING_FOR_OP_ID = "WAITING_FOR_OP_ID";\r
+    private static final String KEY_AUTH_TOKEN = "AUTH_TOKEN";\r

 \r
     private static final String AUTH_ON = "on";\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
     public static final byte ACTION_CREATE = 0;\r
     private static final String AUTH_OPTIONAL = "optional";\r
 \r
     public static final byte ACTION_CREATE = 0;\r

-    public static final byte ACTION_UPDATE_TOKEN = 1;\r
+    public static final byte ACTION_UPDATE_TOKEN = 1;               // requested by the user\r
+    public static final byte ACTION_UPDATE_EXPIRED_TOKEN = 2;       // detected by the app\r

 \r
 \r

+    private static final String UNTRUSTED_CERT_DIALOG_TAG = "UNTRUSTED_CERT_DIALOG";\r

     private static final String SAML_DIALOG_TAG = "SAML_DIALOG";\r
     private static final String WAIT_DIALOG_TAG = "WAIT_DIALOG";\r
 \r
     private static final String SAML_DIALOG_TAG = "SAML_DIALOG";\r
     private static final String WAIT_DIALOG_TAG = "WAIT_DIALOG";\r
 \r

-    private String mHostBaseUrl;                // TODO remove\r
-    private OwnCloudVersion mDiscoveredVersion; // TODO remove\r
-\r
-    private String mAuthMessageText;\r
-    private int mAuthMessageVisibility, mServerStatusText, mServerStatusIcon;\r
-    private boolean mServerIsChecked, mServerIsValid, mIsSslConn;\r
-    private AuthenticationMethod mServerAuthMethod = AuthenticationMethod.UNKNOWN;\r
-\r
-    private int mGetServerInfoOpId = -1;\r
-    private int mOauth2GetAccessTokenOpId = -1;\r
+    \r
+    /// parameters from EXTRAs in starter Intent\r
+    private byte mAction;\r
+    private Account mAccount;\r
+    private String mAuthTokenType;\r

 \r
 \r

-    private int mAuthStatusText, mAuthStatusIcon;    \r
-    private TextView mAuthStatusLayout;\r

 \r
 \r

+    /// activity-level references / state\r

     private final Handler mHandler = new Handler();\r
     private final Handler mHandler = new Handler();\r

-    private GetServerInfoOperation mServerInfoOperation;\r
-\r
-    private int mExistenceCheckOpId = -1;\r
-    private int mGetUserNameOpId = -1;\r
-    \r
-    private Uri mNewCapturedUriFromOAuth2Redirection;\r
-\r
+    private ServiceConnection mOperationsServiceConnection = null;\r
+    private OperationsServiceBinder mOperationsServiceBinder = null;\r

     private AccountManager mAccountMgr;\r
     private AccountManager mAccountMgr;\r

-    private boolean mJustCreated;\r
-    private byte mAction;\r
-    private Account mAccount;\r
+    private Uri mNewCapturedUriFromOAuth2Redirection;\r

 \r
 \r

-    private TextView mAuthMessage;\r

 \r
 \r

+    /// Server PRE-Fragment elements \r

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

-    private boolean mHostUrlInputEnabled;\r

     private View mRefreshButton;\r
     private View mRefreshButton;\r

+    private TextView mServerStatusView;\r
+    \r
+    private TextWatcher mHostUrlInputWatcher;\r
+    private int mServerStatusText = 0, mServerStatusIcon = 0;\r
+    \r
+    private boolean mServerIsChecked = false;\r
+    private boolean mServerIsValid = false;\r
+    private boolean mPendingAutoCheck = false;\r

 \r
 \r

-    private String mAuthTokenType;\r
-\r
-    private EditText mUsernameInput;\r
-    private EditText mPasswordInput;\r
-\r
+    private GetServerInfoOperation.ServerInfo mServerInfo = \r
+            new GetServerInfoOperation.ServerInfo();\r
+    \r
+    \r
+    /// Authentication PRE-Fragment elements \r

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

-\r

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

-\r
-    private SamlWebViewDialog mSamlDialog;\r
-\r
+    private EditText mUsernameInput;\r
+    private EditText mPasswordInput;\r

     private View mOkButton;\r
     private View mOkButton;\r

+    private TextView mAuthStatusView;\r

 \r
 \r

-    private String mAuthToken;\r
-\r
-    private boolean mResumed; // Control if activity is resumed\r
-\r
-    public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
+    private int mAuthStatusText = 0, mAuthStatusIcon = 0;\r

     \r
     \r

-    private ServiceConnection mOperationsServiceConnection = null;\r
-    \r
-    private OperationsServiceBinder mOperationsServiceBinder = null;\r
+    private String mAuthToken = "";\r

 \r
 \r

-    private GetServerInfoOperation.ServerInfo mServerInfo;\r
+    \r
+    /// Identifier of operation in progress which result shouldn't be lost \r
+    private long mWaitingForOpId = Long.MAX_VALUE;\r

 \r
 \r

+    \r

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


@@ -198,6 +184,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r
      */\r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r

+        //Log_OC.wtf(TAG,  "onCreate init");\r

         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r


@@ -212,167 +199,179 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                         .show();\r
             finish();\r
         }\r
                         .show();\r
             finish();\r
         }\r

-                \r
-        /// set view and get references to view elements\r
+\r
+        /// init activity state\r
+        mAccountMgr = AccountManager.get(this);\r
+        mNewCapturedUriFromOAuth2Redirection = null;\r
+        \r
+        /// get input values\r
+        mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); \r
+        mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
+        if (savedInstanceState == null) {\r
+            initAuthTokenType();\r
+        } else {\r
+            mAuthTokenType = savedInstanceState.getString(KEY_AUTH_TOKEN_TYPE);\r
+            mWaitingForOpId = savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID);\r
+        }\r
+        \r
+        /// load user interface\r

         setContentView(R.layout.account_setup);\r
         setContentView(R.layout.account_setup);\r

-        mAuthMessage = (TextView) findViewById(R.id.auth_message);\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
+        \r
+        /// initialize general UI elements\r
+        initOverallUi(savedInstanceState);\r
+        \r

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

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

 \r
 \r

-        /// set Host Url Input Enabled\r
-        mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);\r
+        /// initialize block to be moved to single Fragment to check server and get info about it \r
+        initServerPreFragment(savedInstanceState);\r
+        \r
+        /// initialize block to be moved to single Fragment to retrieve and validate credentials \r
+        initAuthorizationPreFragment(savedInstanceState);\r

 \r
 \r

-        /// set visibility of link for new users\r
-        boolean accountRegisterVisibility = getResources().getBoolean(R.bool.show_welcome_link);\r
-        Button welcomeLink = (Button) findViewById(R.id.welcome_link);\r
-        if (welcomeLink != null) {\r
-            if (accountRegisterVisibility) {\r
-                welcomeLink.setVisibility(View.VISIBLE);\r
-                welcomeLink.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
+        //Log_OC.wtf(TAG,  "onCreate end");\r
+    }\r
+\r
+    private void initAuthTokenType() {\r
+        mAuthTokenType = \r
+                getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
+        if (mAuthTokenType == null) {\r
+            if (mAccount != null) {\r
+                boolean oAuthRequired = \r
+                    (mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_OAUTH2) != null);\r
+                boolean samlWebSsoRequired = \r
+                    (mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null);\r
+                mAuthTokenType = chooseAuthTokenType(oAuthRequired, samlWebSsoRequired);\r
+                \r

             } else {\r
             } else {\r

-                findViewById(R.id.welcome_link).setVisibility(View.GONE);\r
+                boolean oAuthSupported = AUTH_ON.equals(getString(R.string.auth_method_oauth2));\r
+                boolean samlWebSsoSupported = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));\r
+                mAuthTokenType = chooseAuthTokenType(oAuthSupported, samlWebSsoSupported);\r

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

+    }\r

 \r
 \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
+    private String chooseAuthTokenType(boolean oauth, boolean saml) {\r
+        if (saml) {\r
+            return AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType());\r
+        } else if (oauth) {\r
+             return AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType());\r
+        } else {\r
+            return AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
+        }\r
+    }\r

 \r
 \r

+    \r
+    /**\r
+     * Configures elements in the user interface under direct control of the Activity.\r
+     * \r
+     * @param savedInstanceState        Saved activity state, as in {{@link #onCreate(Bundle)}\r
+     */\r
+    private void initOverallUi(Bundle savedInstanceState) {\r
+        \r
+        /// step 1 - load and process relevant inputs (resources, intent, savedInstanceState)\r
+        boolean isWelcomeLinkVisible = getResources().getBoolean(R.bool.show_welcome_link);\r
+        \r
+        String instructionsMessageText = null; \r
+        if (mAction == ACTION_UPDATE_EXPIRED_TOKEN) {\r
+            if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType())\r
+                    .equals(mAuthTokenType)) {\r
+                instructionsMessageText = getString(R.string.auth_expired_oauth_token_toast);\r
+                \r
+            } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType())\r
+                    .equals(mAuthTokenType)) {\r
+                instructionsMessageText = getString(R.string.auth_expired_saml_sso_token_toast);\r
+                \r
+            } else {\r
+                instructionsMessageText = getString(R.string.auth_expired_basic_auth_toast);\r
+            }\r
+        }\r
+        \r
+        /// step 2 - set properties of UI elements (text, visibility, enabled...)\r
+        Button welcomeLink = (Button) findViewById(R.id.welcome_link);\r
+        welcomeLink.setVisibility(isWelcomeLinkVisible ? View.VISIBLE : View.GONE);\r
+        welcomeLink.setText(\r
+                String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
+        \r
+        TextView instructionsView = (TextView) findViewById(R.id.instructions_message);\r
+        if (instructionsMessageText != null) {\r
+            instructionsView.setVisibility(View.VISIBLE);\r
+            instructionsView.setText(instructionsMessageText);\r

         } else {\r
         } else {\r

-            mRefreshButton = findViewById(R.id.embeddedRefreshButton);\r
+            instructionsView.setVisibility(View.GONE);\r

         }\r
         }\r

+    }\r
+\r
+\r
+    /**\r
+     * \r
+     * @param savedInstanceState        Saved activity state, as in {{@link #onCreate(Bundle)}\r
+     */\r
+    private void initServerPreFragment(Bundle savedInstanceState) {\r

 \r
 \r

+        /// step 1 - load and process relevant inputs (resources, intent, savedInstanceState)\r
+        boolean isUrlInputAllowed = getResources().getBoolean(R.bool.show_server_url_input); \r

         if (savedInstanceState == null) {\r
         if (savedInstanceState == null) {\r

-            mResumed = false;\r
-            /// connection state and info\r
-            mAuthMessageVisibility = View.GONE;\r
-            mServerStatusText = mServerStatusIcon = 0;\r
-            mServerIsValid = false;\r
-            mServerIsChecked = false;\r
-            mIsSslConn = false;\r
-            mAuthStatusText = mAuthStatusIcon = 0;\r
-\r
-            /// retrieve extras from intent\r
-            mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
-            if (mAccount != null) {
-                String ocVersion = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);
+            if (mAccount != null) {\r
+                mServerInfo.mBaseUrl = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL);\r
+                mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith("https://");   // TODO do this in a setter for mBaseUrl\r
+                String ocVersion = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);\r

                 if (ocVersion != null) {\r
                 if (ocVersion != null) {\r

-                    mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
+                    mServerInfo.mVersion = new OwnCloudVersion(ocVersion);\r

                 }\r
                 }\r

-                mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL));\r
-                mHostUrlInput.setText(mHostBaseUrl);\r
-                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
-                mUsernameInput.setText(userName);
-\r
-            }\r
-            initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
-            mJustCreated = true;\r
-\r
-            if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r
-                checkOcServer(); \r
+            } else {\r
+                mServerInfo.mBaseUrl = getString(R.string.server_url).trim();\r
+                mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith("https://");\r

             }\r
             }\r

-\r

         } else {\r
         } else {\r

-            mResumed = true;\r
-            /// connection state and info\r
-            mAuthMessageVisibility = savedInstanceState.getInt(KEY_AUTH_MESSAGE_VISIBILITY);\r
-            mAuthMessageText = savedInstanceState.getString(KEY_AUTH_MESSAGE_TEXT);\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
             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
+            \r
+            mServerIsValid = savedInstanceState.getBoolean(KEY_SERVER_VALID);\r
+            mServerIsChecked = savedInstanceState.getBoolean(KEY_SERVER_CHECKED);\r
+            \r
+            // TODO parcelable\r
+            mServerInfo.mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);\r
+            mServerInfo.mBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r

             String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
             if (ocVersion != null) {\r
             String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
             if (ocVersion != null) {\r

-                mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
+                mServerInfo.mVersion = new OwnCloudVersion(ocVersion);\r

             }\r
             }\r

-            mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r
-\r
-            // account data, if updating\r
-            mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
-            mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
-            if (mAuthTokenType == null) {\r
-                mAuthTokenType =  AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\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
-            mServerAuthMethod = AuthenticationMethod.valueOf(\r
+            mServerInfo.mAuthMethod = AuthenticationMethod.valueOf(\r

                     savedInstanceState.getString(KEY_SERVER_AUTH_METHOD));\r
                     savedInstanceState.getString(KEY_SERVER_AUTH_METHOD));\r

-            mGetServerInfoOpId = savedInstanceState.getInt(KEY_DETECT_AUTH_OP_ID);\r
-\r
-        }\r
-\r
-        if (mAuthMessageVisibility== View.VISIBLE) {\r
-            showAuthMessage(mAuthMessageText);\r
-        }\r
-        else {\r
-            hideAuthMessage();\r
+            \r

         }\r
         }\r

-        adaptViewAccordingToAuthenticationMethod();\r
-        showServerStatus();\r
-        showAuthStatus();\r
-\r
-        if (mAction == ACTION_UPDATE_TOKEN) {\r
+        \r
+        /// step 2 - set properties of UI elements (text, visibility, enabled...)\r
+        mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r
+        mHostUrlInput.setText(mServerInfo.mBaseUrl);\r
+        if (mAction != ACTION_CREATE) {\r

             /// lock things that should not change\r
             mHostUrlInput.setEnabled(false);\r
             mHostUrlInput.setFocusable(false);\r
             /// lock things that should not change\r
             mHostUrlInput.setEnabled(false);\r
             mHostUrlInput.setFocusable(false);\r

-            mUsernameInput.setEnabled(false);\r
-            mUsernameInput.setFocusable(false);\r
-            mOAuth2Check.setVisibility(View.GONE);\r

         }\r
         }\r

-\r
-        showRefreshButton(mServerIsChecked && !mServerIsValid && refreshButtonEnabled);\r
-        mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
-\r
-        if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType) || \r
-                !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
-            mOAuth2Check.setVisibility(View.GONE);\r
+        if (isUrlInputAllowed) {\r
+            mRefreshButton = findViewById(R.id.embeddedRefreshButton);\r
+        } else {\r
+            findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);\r
+            mRefreshButton = findViewById(R.id.centeredRefreshButton);\r

         }\r
         }\r

-\r
-        mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)\r
-\r
-        /// bind view elements to listeners and other friends\r
-        mHostUrlInput.setOnFocusChangeListener(this);\r
+        showRefreshButton(mServerIsChecked && !mServerIsValid && \r
+                mWaitingForOpId > Integer.MAX_VALUE);\r
+        mServerStatusView = (TextView) findViewById(R.id.server_status_text);\r
+        showServerStatus();\r
+        \r
+        /// step 3 - bind some listeners and options\r

         mHostUrlInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);\r
         mHostUrlInput.setOnEditorActionListener(this);\r
         mHostUrlInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);\r
         mHostUrlInput.setOnEditorActionListener(this);\r

-        mHostUrlInput.addTextChangedListener(new TextWatcher() {\r
-\r
+        \r
+        /// step 4 - create listeners that will be bound at onResume\r
+        mHostUrlInputWatcher = new TextWatcher() {\r
+            \r

             @Override\r
             public void afterTextChanged(Editable s) {\r
             @Override\r
             public void afterTextChanged(Editable s) {\r

-                if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r
+                if (mOkButton.isEnabled() &&\r
+                        !mServerInfo.mBaseUrl.equals(\r
+                                normalizeUrl(s.toString(), mServerInfo.mIsSslConn))) {\r

                     mOkButton.setEnabled(false);\r
                 }\r
             }\r
                     mOkButton.setEnabled(false);\r
                 }\r
             }\r


@@ -383,28 +382,17 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
             @Override\r
             public void onTextChanged(CharSequence s, int start, int before, int count) {\r
 \r
             @Override\r
             public void onTextChanged(CharSequence s, int start, int before, int count) {\r

-                if (!mResumed) {\r
+                if (mAuthStatusIcon != 0) {\r
+                    Log_OC.d(TAG, "onTextChanged: hiding authentication status");\r

                     mAuthStatusIcon = 0;\r
                     mAuthStatusText = 0;\r
                     mAuthStatusIcon = 0;\r
                     mAuthStatusText = 0;\r

-                    showAuthStatus();                    \r
+                    showAuthStatus();\r

                 }\r
                 }\r

-                mResumed = false;\r

             }\r
             }\r

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

+        // TODO find out if this is really necessary, or if it can done in a different way\r

         findViewById(R.id.scroll).setOnTouchListener(new OnTouchListener() {\r
             @Override\r
             public boolean onTouch(View view, MotionEvent event) {\r
         findViewById(R.id.scroll).setOnTouchListener(new OnTouchListener() {\r
             @Override\r
             public boolean onTouch(View view, MotionEvent event) {\r


@@ -417,48 +405,123 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 return false;\r
             }\r
         });\r
                 return false;\r
             }\r
         });\r

+     \r

         \r
         \r

+        /// step 4 - mark automatic check to be started when OperationsService is ready\r
+        mPendingAutoCheck = (savedInstanceState == null && \r
+                (mAction != ACTION_CREATE || !isUrlInputAllowed));\r

     }\r
     }\r

+    \r
+    \r
+    /**\r
+     * \r
+     * @param savedInstanceState        Saved activity state, as in {{@link #onCreate(Bundle)}\r
+     */\r
+    private void initAuthorizationPreFragment(Bundle savedInstanceState) {\r
+        \r
+        /// step 0 - get UI elements in layout\r
+        mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
+        mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
+        mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
+        mUsernameInput = (EditText) findViewById(R.id.account_username);\r
+        mPasswordInput = (EditText) findViewById(R.id.account_password);\r
+        mAuthStatusView = (TextView) findViewById(R.id.auth_status_text); \r
+        \r
+        /// step 1 - load and process relevant inputs (resources, intent, savedInstanceState)\r
+        String presetUserName = null;\r
+        boolean isPasswordExposed = false;\r
+        if (savedInstanceState == null) {\r
+            if (mAccount != null) {\r
+                presetUserName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
+            }\r
+            \r
+        } else {\r
+            isPasswordExposed = savedInstanceState.getBoolean(KEY_PASSWORD_EXPOSED, false);\r
+            mAuthStatusText = savedInstanceState.getInt(KEY_AUTH_STATUS_TEXT);\r
+            mAuthStatusIcon = savedInstanceState.getInt(KEY_AUTH_STATUS_ICON);\r
+            mAuthToken = savedInstanceState.getString(KEY_AUTH_TOKEN);\r
+        }\r
+        \r
+        /// step 2 - set properties of UI elements (text, visibility, enabled...)\r
+        mOAuth2Check.setChecked(\r
+                AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType())\r
+                    .equals(mAuthTokenType));\r
+        if (presetUserName != null) {\r
+            mUsernameInput.setText(presetUserName);\r
+        }\r
+        if (mAction != ACTION_CREATE) {\r
+            mUsernameInput.setEnabled(false);\r
+            mUsernameInput.setFocusable(false);\r
+        }\r
+        mPasswordInput.setText(""); // clean password to avoid social hacking\r
+        if (isPasswordExposed) {\r
+            showPassword();\r
+        }\r
+        updateAuthenticationPreFragmentVisibility();\r
+        showAuthStatus();\r
+        mOkButton.setEnabled(mServerIsValid);\r

 \r
 \r

+        \r
+        /// step 3 - bind listeners\r
+        // bindings for password input field\r
+        mPasswordInput.setOnFocusChangeListener(this);\r
+        mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);\r
+        mPasswordInput.setOnEditorActionListener(this);\r
+        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

-    private void initAuthorizationMethod() {\r
-        boolean oAuthRequired = false;\r
-        boolean samlWebSsoRequired = false;\r
-\r
-        mAuthTokenType = 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 (mAuthTokenType == null) {    \r
-            if (mAccount != null) {\r
-                /// same authentication method than the one used to create the account to update\r
-                oAuthRequired = (mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_OAUTH2) != null);\r
-                samlWebSsoRequired = (mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null);\r
-\r
+    /**\r
+     * Changes the visibility of input elements depending on\r
+     * the current authorization method.\r
+     */\r
+    private void updateAuthenticationPreFragmentVisibility () {\r
+        if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).\r
+                equals(mAuthTokenType)) {\r
+            // SAML-based web Single Sign On\r
+            mOAuth2Check.setVisibility(View.GONE);\r
+            mOAuthAuthEndpointText.setVisibility(View.GONE);\r
+            mOAuthTokenEndpointText.setVisibility(View.GONE);\r
+            mUsernameInput.setVisibility(View.GONE);\r
+            mPasswordInput.setVisibility(View.GONE);\r
+            \r
+        } else {\r
+            if (mAction == ACTION_CREATE && \r
+                    AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
+                mOAuth2Check.setVisibility(View.VISIBLE);\r

             } else {\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
+                mOAuth2Check.setVisibility(View.GONE);\r

             }\r
             }\r

-            if (oAuthRequired) {\r
-                mAuthTokenType = AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType());\r
-            } else if (samlWebSsoRequired) {\r
-                mAuthTokenType = AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType());\r
+            \r
+            if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).\r
+                    equals(mAuthTokenType)) {\r
+                // OAuth 2 authorization\r
+                \r
+                mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
+                mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
+                mUsernameInput.setVisibility(View.GONE);\r
+                mPasswordInput.setVisibility(View.GONE);\r
+    \r

             } else {\r
             } else {\r

-                mAuthTokenType = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\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

             }\r
         }\r
             }\r
         }\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(AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType));\r

 \r
 \r

-    }\r

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


@@ -470,40 +533,32 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
      */\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r

-        //Log.wtf(TAG, "onSaveInstanceState init" );\r
+        //Log_OC.wtf(TAG, "onSaveInstanceState init" );\r

         super.onSaveInstanceState(outState);\r
 \r
         super.onSaveInstanceState(outState);\r
 \r

-        /// connection state and info\r
-        outState.putInt(KEY_AUTH_MESSAGE_VISIBILITY, mAuthMessage.getVisibility());\r
-        outState.putString(KEY_AUTH_MESSAGE_TEXT, mAuthMessage.getText().toString());\r
+        /// global state\r
+        outState.putString(KEY_AUTH_TOKEN_TYPE, mAuthTokenType);\r
+        outState.putLong(KEY_WAITING_FOR_OP_ID, mWaitingForOpId);\r
+\r
+        /// Server PRE-fragment state\r

         outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);\r
         outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);\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_CHECKED, mServerIsChecked);\r

-        outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerIsValid && mServerInfoOperation != null));\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
-        if (mDiscoveredVersion != null) {\r
-            outState.putString(KEY_OC_VERSION, mDiscoveredVersion.getVersion());\r
+        outState.putBoolean(KEY_SERVER_VALID, mServerIsValid);\r
+        outState.putBoolean(KEY_IS_SSL_CONN, mServerInfo.mIsSslConn);\r
+        outState.putString(KEY_HOST_URL_TEXT, mServerInfo.mBaseUrl);\r
+        if (mServerInfo.mVersion != null) {\r
+            outState.putString(KEY_OC_VERSION, mServerInfo.mVersion.getVersion());\r

         }\r
         }\r

-        outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r
+        outState.putString(KEY_SERVER_AUTH_METHOD, mServerInfo.mAuthMethod.name());\r

 \r
 \r

-        /// account data, if updating\r
-        if (mAccount != null) {\r
-            outState.putParcelable(KEY_ACCOUNT, mAccount);\r
-        }\r
-        outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mAuthTokenType);\r
+        /// Authentication PRE-fragment state\r
+        outState.putBoolean(KEY_PASSWORD_EXPOSED, isPasswordVisible());\r
+        outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);\r
+        outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);\r
+        outState.putString(KEY_AUTH_TOKEN, mAuthToken);\r

 \r
 \r

-        // refresh button enabled\r
-        outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r
-        \r
-        outState.putString(KEY_SERVER_AUTH_METHOD, mServerAuthMethod.name());\r
-        outState.putInt(KEY_DETECT_AUTH_OP_ID, mGetServerInfoOpId);\r
-        //Log.wtf(TAG, "onSaveInstanceState end" );\r
+        //Log_OC.wtf(TAG, "onSaveInstanceState end" );\r

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


@@ -530,49 +585,45 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     @Override\r
     protected void onResume() {\r
      */\r
     @Override\r
     protected void onResume() {\r

-        //Log.wtf(TAG, "onResume init" );\r
+        //Log_OC.wtf(TAG, "onResume init" );\r

         super.onResume();\r
         \r
         super.onResume();\r
         \r

-        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {\r
-            if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
-                //Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
-                showAuthMessage(getString(R.string.auth_expired_oauth_token_toast));\r
-            } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
-                //Toast.makeText(this, R.string.auth_expired_saml_sso_token_toast, Toast.LENGTH_LONG).show();\r
-                showAuthMessage(getString(R.string.auth_expired_saml_sso_token_toast));\r
-            } else {\r
-                //Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
-                showAuthMessage(getString(R.string.auth_expired_basic_auth_toast));\r
-            }\r
-        }\r
-\r
+        // bound here to avoid spurious changes triggered by Android on device rotations\r
+        mHostUrlInput.setOnFocusChangeListener(this);\r
+        mHostUrlInput.addTextChangedListener(mHostUrlInputWatcher);\r
+        \r

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

-        mJustCreated = false;\r
-\r

         if (mOperationsServiceBinder != null) {\r
             doOnResumeAndBound();\r
         }\r
         \r
         if (mOperationsServiceBinder != null) {\r
             doOnResumeAndBound();\r
         }\r
         \r

-        //Log.wtf(TAG, "onResume end" );\r
+        //Log_OC.wtf(TAG, "onResume end" );\r

     }\r
 \r
     \r
     @Override\r
     protected void onPause() {\r
     }\r
 \r
     \r
     @Override\r
     protected void onPause() {\r

-        //Log.wtf(TAG, "onPause init" );\r
+        //Log_OC.wtf(TAG, "onPause init" );\r

         if (mOperationsServiceBinder != null) {\r
         if (mOperationsServiceBinder != null) {\r

-            //Log.wtf(TAG, "unregistering to listen for operation callbacks" );\r
+            //Log_OC.wtf(TAG, "unregistering to listen for operation callbacks" );\r

             mOperationsServiceBinder.removeOperationListener(this);\r
         }\r
             mOperationsServiceBinder.removeOperationListener(this);\r
         }\r

+        \r
+        mHostUrlInput.removeTextChangedListener(mHostUrlInputWatcher);\r
+        mHostUrlInput.setOnFocusChangeListener(null);\r
+        \r

         super.onPause();\r
         super.onPause();\r

-        //Log.wtf(TAG, "onPause end" );\r
+        //Log_OC.wtf(TAG, "onPause end" );\r

     }\r
     \r
     @Override\r
     protected void onDestroy() {\r
     }\r
     \r
     @Override\r
     protected void onDestroy() {\r

+\r
+        mHostUrlInputWatcher = null;\r
+        \r

         if (mOperationsServiceConnection != null) {\r
             unbindService(mOperationsServiceConnection);\r
             mOperationsServiceBinder = null;\r
         if (mOperationsServiceConnection != null) {\r
             unbindService(mOperationsServiceConnection);\r
             mOperationsServiceBinder = null;\r


@@ -608,8 +659,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 queryParameters);\r
         \r
         if (mOperationsServiceBinder != null) {\r
                 queryParameters);\r
         \r
         if (mOperationsServiceBinder != null) {\r

-            //Log.wtf(TAG, "getting access token..." );\r
-            mOauth2GetAccessTokenOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
+            //Log_OC.wtf(TAG, "getting access token..." );\r
+            mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r

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


@@ -645,7 +696,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param hostInput     TextView with the URL input field receiving the change of focus.\r
      */\r
     private void onUrlInputFocusLost(TextView hostInput) {\r
      * @param hostInput     TextView with the URL input field receiving the change of focus.\r
      */\r
     private void onUrlInputFocusLost(TextView hostInput) {\r

-        if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r
+        if (!mServerInfo.mBaseUrl.equals(\r
+                normalizeUrl(mHostUrlInput.getText().toString(), mServerInfo.mIsSslConn))) {\r
+            // check server again only if the user changed something in the field\r

             checkOcServer();\r
         } else {\r
             mOkButton.setEnabled(mServerIsValid);\r
             checkOcServer();\r
         } else {\r
             mOkButton.setEnabled(mServerIsValid);\r


@@ -656,16 +709,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
     private void checkOcServer() {\r
         String uri = mHostUrlInput.getText().toString().trim();\r
 \r
     private void checkOcServer() {\r
         String uri = mHostUrlInput.getText().toString().trim();\r

-\r
-        if (!mHostUrlInputEnabled){\r
-            uri = getString(R.string.server_url).trim();\r
-        }\r
-\r

         mServerIsValid = false;\r
         mServerIsChecked = false;\r
         mOkButton.setEnabled(false);\r
         mServerIsValid = false;\r
         mServerIsChecked = false;\r
         mOkButton.setEnabled(false);\r

-        mDiscoveredVersion = null;\r
-        mServerAuthMethod = AuthenticationMethod.UNKNOWN;\r
+        mServerInfo = new GetServerInfoOperation.ServerInfo();\r

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


@@ -678,8 +725,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             getServerInfoIntent.putExtra(OperationsService.EXTRA_SERVER_URL, uri);\r
             getServerInfoIntent.putExtra(OperationsService.EXTRA_AUTH_TOKEN_TYPE, mAuthTokenType);\r
             if (mOperationsServiceBinder != null) {\r
             getServerInfoIntent.putExtra(OperationsService.EXTRA_SERVER_URL, uri);\r
             getServerInfoIntent.putExtra(OperationsService.EXTRA_AUTH_TOKEN_TYPE, mAuthTokenType);\r
             if (mOperationsServiceBinder != null) {\r

-                //Log.wtf(TAG, "checking server..." );\r
-                mGetServerInfoOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
+                //Log_OC.wtf(TAG, "checking server..." );\r
+                mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
+            } else {\r
+              Log_OC.wtf(TAG, "Server check tried with OperationService unbound!" );\r

             }\r
             \r
         } else {\r
             }\r
             \r
         } else {\r


@@ -711,10 +760,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
 \r
     private void showViewPasswordButton() {\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
         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
             drawable = R.drawable.ic_hide;\r
         }\r
         mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, drawable, 0);\r


@@ -754,12 +801,15 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     public void onOkClick(View view) {\r
         // this check should be unnecessary\r
      */\r
     public void onOkClick(View view) {\r
         // this check should be unnecessary\r

-        if (mDiscoveredVersion == null || !mDiscoveredVersion.isVersionValid()  || mHostBaseUrl == null || mHostBaseUrl.length() == 0) {\r
+        if (mServerInfo.mVersion == null || \r
+                !mServerInfo.mVersion.isVersionValid()  || \r
+                mServerInfo.mBaseUrl == null || \r
+                mServerInfo.mBaseUrl.length() == 0) {\r

             mServerStatusIcon = R.drawable.common_error;\r
             mServerStatusText = R.string.auth_wtf_reenter_URL;\r
             showServerStatus();\r
             mOkButton.setEnabled(false);\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
+            //Log_OC.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -779,7 +829,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     private void checkBasicAuthorization() {\r
         /// get the path to the root folder through WebDAV from the version 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, mAuthTokenType);\r
+        String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r

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


@@ -800,10 +850,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
     private void startExistenceCheckRemoteOperation(String remotePath, Context context, boolean successIfAbsent, String webdav_path,\r
             String username, String password, boolean followRedirects) {\r
 \r
     private void startExistenceCheckRemoteOperation(String remotePath, Context context, boolean successIfAbsent, String webdav_path,\r
             String username, String password, boolean followRedirects) {\r

-        \r

         Intent existenceCheckIntent = new Intent();\r
         existenceCheckIntent.setAction(OperationsService.ACTION_EXISTENCE_CHECK);\r
         Intent existenceCheckIntent = new Intent();\r
         existenceCheckIntent.setAction(OperationsService.ACTION_EXISTENCE_CHECK);\r

-        existenceCheckIntent.putExtra(OperationsService.EXTRA_SERVER_URL, mHostBaseUrl);\r
+        existenceCheckIntent.putExtra(OperationsService.EXTRA_SERVER_URL, mServerInfo.mBaseUrl);\r

         existenceCheckIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath);\r
         existenceCheckIntent.putExtra(OperationsService.EXTRA_SUCCESS_IF_ABSENT, successIfAbsent);\r
         existenceCheckIntent.putExtra(OperationsService.EXTRA_WEBDAV_PATH, webdav_path);\r
         existenceCheckIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath);\r
         existenceCheckIntent.putExtra(OperationsService.EXTRA_SUCCESS_IF_ABSENT, successIfAbsent);\r
         existenceCheckIntent.putExtra(OperationsService.EXTRA_WEBDAV_PATH, webdav_path);\r


@@ -813,8 +862,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         existenceCheckIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
         \r
         if (mOperationsServiceBinder != null) {\r
         existenceCheckIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
         \r
         if (mOperationsServiceBinder != null) {\r

-            Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." );\r
-            mExistenceCheckOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent);\r
+            //Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." );\r
+            mWaitingForOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent);\r

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


@@ -829,14 +878,12 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         showAuthStatus();\r
 \r
         // GET AUTHORIZATION request\r
         showAuthStatus();\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
         Uri.Builder uriBuilder = uri.buildUpon();\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_RESPONSE_TYPE, getString(R.string.oauth2_response_type));\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_REDIRECT_URI, getString(R.string.oauth2_redirect_uri));   \r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_CLIENT_ID, getString(R.string.oauth2_client_id));\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_SCOPE, getString(R.string.oauth2_scope));\r
         Uri uri = Uri.parse(mOAuthAuthEndpointText.getText().toString().trim());\r
         Uri.Builder uriBuilder = uri.buildUpon();\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_RESPONSE_TYPE, getString(R.string.oauth2_response_type));\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_REDIRECT_URI, getString(R.string.oauth2_redirect_uri));   \r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_CLIENT_ID, getString(R.string.oauth2_client_id));\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_SCOPE, getString(R.string.oauth2_scope));\r

-        //uriBuilder.appendQueryParameter(OAuth2Constants.KEY_STATE, whateverwewant);\r

         uri = uriBuilder.build();\r
         Log_OC.d(TAG, "Starting browser to view " + uri.toString());\r
         Intent i = new Intent(Intent.ACTION_VIEW, uri);\r
         uri = uriBuilder.build();\r
         Log_OC.d(TAG, "Starting browser to view " + uri.toString());\r
         Intent i = new Intent(Intent.ACTION_VIEW, uri);\r


@@ -858,7 +905,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);\r
 \r
         /// get the path to the root folder through WebDAV from the version server\r
         dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);\r
 \r
         /// get the path to the root folder through WebDAV from the version server\r

-        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
+        String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r

 \r
         /// test credentials accessing the root folder\r
         String remotePath ="";\r
 \r
         /// test credentials accessing the root folder\r
         String remotePath ="";\r


@@ -877,7 +924,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
 \r
         if (operation instanceof GetServerInfoOperation) {\r
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
 \r
         if (operation instanceof GetServerInfoOperation) {\r

-            if (operation.hashCode() == mGetServerInfoOpId) {\r
+            if (operation.hashCode() == mWaitingForOpId) {\r

                 onGetServerInfoFinish(result);\r
             }   // else nothing ; only the last check operation is considered; \r
                 // multiple can be started if the user amends a URL quickly\r
                 onGetServerInfoFinish(result);\r
             }   // else nothing ; only the last check operation is considered; \r
                 // multiple can be started if the user amends a URL quickly\r


@@ -886,7 +933,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             onGetOAuthAccessTokenFinish(result);\r
 \r
         } else if (operation instanceof ExistenceCheckRemoteOperation)  {\r
             onGetOAuthAccessTokenFinish(result);\r
 \r
         } else if (operation instanceof ExistenceCheckRemoteOperation)  {\r

-            Log_OC.wtf(TAG, "received detection response through callback" );\r
+            //Log_OC.wtf(TAG, "received detection response through callback" );\r

             if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                 onSamlBasedFederatedSingleSignOnAuthorizationStart(result);\r
 \r
             if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                 onSamlBasedFederatedSingleSignOnAuthorizationStart(result);\r
 \r


@@ -900,7 +947,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\r
 \r
     private void onGetUserNameFinish(RemoteOperationResult result) {\r
     }\r
 \r
     private void onGetUserNameFinish(RemoteOperationResult result) {\r

-        mGetUserNameOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r

         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = (String) result.getData().get(0);\r
         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = (String) result.getData().get(0);\r


@@ -933,17 +980,17 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\r
 \r
     private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperationResult result) {\r
     }\r
 \r
     private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperationResult result) {\r

-        mExistenceCheckOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r

         dismissDialog(WAIT_DIALOG_TAG);\r
 
         dismissDialog(WAIT_DIALOG_TAG);\r
 

-        //if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r

         if (result.isIdPRedirection()) {
             String url = result.getRedirectedLocation();\r
         if (result.isIdPRedirection()) {
             String url = result.getRedirectedLocation();\r

-            String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
+            String targetUrl = mServerInfo.mBaseUrl \r
+                    + AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r

 \r
             // Show dialog\r
 \r
             // Show dialog\r

-            mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
-            mSamlDialog.show(getSupportFragmentManager(), SAML_DIALOG_TAG);\r
+            SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
+            dialog.show(getSupportFragmentManager(), SAML_DIALOG_TAG);\r

 \r
             mAuthStatusIcon = 0;\r
             mAuthStatusText = 0;\r
 \r
             mAuthStatusIcon = 0;\r
             mAuthStatusText = 0;\r


@@ -967,9 +1014,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private void onGetServerInfoFinish(RemoteOperationResult result) {\r
         /// update activity state\r
         mServerIsChecked = true;\r
     private void onGetServerInfoFinish(RemoteOperationResult result) {\r
         /// update activity state\r
         mServerIsChecked = true;\r

-        mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
-        mServerInfoOperation = null;\r
-        mGetServerInfoOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r

         \r
         // update server status, but don't show it yet\r
         updateServerStatusIconAndText(result);\r
         \r
         // update server status, but don't show it yet\r
         updateServerStatusIconAndText(result);\r


@@ -981,11 +1026,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             //      3. we got the server version\r
             //      4. we got the authentication method required by the server \r
             mServerInfo = (GetServerInfoOperation.ServerInfo) (result.getData().get(0));\r
             //      3. we got the server version\r
             //      4. we got the authentication method required by the server \r
             mServerInfo = (GetServerInfoOperation.ServerInfo) (result.getData().get(0));\r

-            mDiscoveredVersion = mServerInfo.mVersion;\r
-            mHostBaseUrl = mServerInfo.mBaseUrl;\r
-            mServerAuthMethod = mServerInfo.mAuthMethod;\r

             \r
             \r

-            if (!authSupported(mServerAuthMethod)) {\r
+            if (!authSupported(mServerInfo.mAuthMethod)) {\r

                 \r
                 updateServerStatusIconNoRegularAuth();  // overrides updateServerStatusIconAndText()  \r
                 mServerIsValid = false;\r
                 \r
                 updateServerStatusIconNoRegularAuth();  // overrides updateServerStatusIconAndText()  \r
                 mServerIsValid = false;\r


@@ -1026,12 +1068,12 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
 \r
     // TODO remove, if possible\r
 \r
 \r
     // TODO remove, if possible\r

-    private String normalizeUrl(String url) {\r
+    private String normalizeUrl(String url, boolean sslWhenUnprefixed) {\r

         if (url != null && url.length() > 0) {\r
             url = url.trim();\r
             if (!url.toLowerCase().startsWith("http://") &&\r
                     !url.toLowerCase().startsWith("https://")) {\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
+                if (sslWhenUnprefixed) {\r

                     url = "https://" + url;\r
                 } else {\r
                     url = "http://" + url;\r
                     url = "https://" + url;\r
                 } else {\r
                     url = "http://" + url;\r


@@ -1239,10 +1281,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param result        Result of the operation.\r
      */\r
     private void onGetOAuthAccessTokenFinish(RemoteOperationResult result) {\r
      * @param result        Result of the operation.\r
      */\r
     private void onGetOAuthAccessTokenFinish(RemoteOperationResult result) {\r

-        mOauth2GetAccessTokenOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r

         dismissDialog(WAIT_DIALOG_TAG);\r
 \r
         dismissDialog(WAIT_DIALOG_TAG);\r
 \r

-        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
+        String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r

         if (result.isSuccess() && webdav_path != null) {\r
             /// be gentle with the user\r
             IndeterminateProgressDialog dialog = \r
         if (result.isSuccess() && webdav_path != null) {\r
             /// be gentle with the user\r
             IndeterminateProgressDialog dialog = \r


@@ -1278,7 +1320,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param result        Result of the operation.\r
      */\r
     private void onAuthorizationCheckFinish(RemoteOperationResult result) {\r
      * @param result        Result of the operation.\r
      */\r
     private void onAuthorizationCheckFinish(RemoteOperationResult result) {\r

-        mExistenceCheckOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r

         dismissDialog(WAIT_DIALOG_TAG);\r
 \r
         if (result.isSuccess()) {\r
         dismissDialog(WAIT_DIALOG_TAG);\r
 \r
         if (result.isSuccess()) {\r


@@ -1298,13 +1340,11 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             }\r
             \r
         } else if (result.isServerFail() || result.isException()) {
             }\r
             \r
         } else if (result.isServerFail() || result.isException()) {

-            /// if server fail or exception in authorization, the UI is updated as when a server check failed\r
+            /// server errors or exceptions in authorization take to requiring a new check of \r
+            /// the server\r

             mServerIsChecked = true;\r
             mServerIsValid = false;\r
             mServerIsChecked = true;\r
             mServerIsValid = false;\r

-            mIsSslConn = false;\r
-            mServerInfoOperation = null;\r
-            mDiscoveredVersion = null;\r
-            mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
+            mServerInfo = new GetServerInfoOperation.ServerInfo();  \r

 \r
             // update status icon and text\r
             updateServerStatusIconAndText(result);\r
 \r
             // update status icon and text\r
             updateServerStatusIconAndText(result);\r


@@ -1373,7 +1413,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         boolean isOAuth = AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType);\r
         boolean isSaml =  AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType);\r
 \r
         boolean isOAuth = AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType);\r
         boolean isSaml =  AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType);\r
 \r

-        Uri uri = Uri.parse(mHostBaseUrl);\r
+        Uri uri = Uri.parse(mServerInfo.mBaseUrl);\r

         String username = mUsernameInput.getText().toString().trim();\r
         if (isOAuth) {\r
             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r
         String username = mUsernameInput.getText().toString().trim();\r
         if (isOAuth) {\r
             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r


@@ -1382,8 +1422,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         if (uri.getPort() >= 0) {\r
             accountName += ":" + uri.getPort();\r
         }\r
         if (uri.getPort() >= 0) {\r
             accountName += ":" + uri.getPort();\r
         }\r

-        mAccount = new Account(accountName, MainApp.getAccountType());\r
-        if (AccountUtils.exists(mAccount, getApplicationContext())) {\r
+        Account newAccount = new Account(accountName, MainApp.getAccountType());\r
+        if (AccountUtils.exists(newAccount, getApplicationContext())) {\r

             // fail - not a new account, but an existing one; disallow\r
             RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_NEW); \r
             updateAuthStatusIconAndText(result);\r
             // fail - not a new account, but an existing one; disallow\r
             RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_NEW); \r
             updateAuthStatusIconAndText(result);\r


@@ -1392,7 +1432,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             return false;\r
 \r
         } else {\r
             return false;\r
 \r
         } else {\r

-\r
+            mAccount = newAccount;\r
+            \r

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


@@ -1420,8 +1461,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
             }\r
             /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA
                 mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
             }\r
             /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA

-            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION,         mDiscoveredVersion.getVersion());\r
-            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_BASE_URL,   mHostBaseUrl);\r
+            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION,    mServerInfo.mVersion.getVersion());\r
+            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_BASE_URL,   mServerInfo.mBaseUrl);\r

 
             if (isSaml) {\r
                 mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); \r
 
             if (isSaml) {\r
                 mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); \r


@@ -1452,17 +1493,18 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the last check on the ownCloud server.\r
     /**\r
      * Updates the content and visibility state of the icon and text associated\r
      * to the last check on the ownCloud server.\r

+     * \r
+     * @param serverStatusText      Resource identifier of the text to show.\r
+     * @param serverStatusIcon      Resource identifier of the icon to show.\r

      */\r
     private void showServerStatus() {\r
      */\r
     private void showServerStatus() {\r

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

         if (mServerStatusIcon == 0 && mServerStatusText == 0) {\r
         if (mServerStatusIcon == 0 && mServerStatusText == 0) {\r

-            tv.setVisibility(View.INVISIBLE);\r
+            mServerStatusView.setVisibility(View.INVISIBLE);\r

 \r
         } else {\r
 \r
         } else {\r

-            tv.setText(mServerStatusText);\r
-            tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);\r
-            tv.setVisibility(View.VISIBLE);\r
+            mServerStatusView.setText(mServerStatusText);\r
+            mServerStatusView.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);\r
+            mServerStatusView.setVisibility(View.VISIBLE);\r

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


@@ -1474,12 +1516,12 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     private void showAuthStatus() {\r
         if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {\r
      */\r
     private void showAuthStatus() {\r
         if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {\r

-            mAuthStatusLayout.setVisibility(View.INVISIBLE);\r
+            mAuthStatusView.setVisibility(View.INVISIBLE);\r

 \r
         } else {\r
 \r
         } else {\r

-            mAuthStatusLayout.setText(mAuthStatusText);\r
-            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);\r
-            mAuthStatusLayout.setVisibility(View.VISIBLE);\r
+            mAuthStatusView.setText(mAuthStatusText);\r
+            mAuthStatusView.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);\r
+            mAuthStatusView.setVisibility(View.VISIBLE);\r

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


@@ -1535,38 +1577,11 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         } else {\r
             mAuthTokenType = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
         }\r
         } else {\r
             mAuthTokenType = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
         }\r

-        adaptViewAccordingToAuthenticationMethod();\r
+        updateAuthenticationPreFragmentVisibility();\r

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

-     * Changes the visibility of input elements depending on\r
-     * the current authorization method.\r
-     */\r
-    private void adaptViewAccordingToAuthenticationMethod () {\r
-        if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType)) {\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
-\r
-        } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\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
-        } 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
-        }\r
-    }\r
-\r
-    /**\r

      *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
      * \r
      *  Used to trigger the authentication check when the user presses 'enter' after writing the password, \r
      *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
      * \r
      *  Used to trigger the authentication check when the user presses 'enter' after writing the password, \r


@@ -1621,36 +1636,27 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\r
 \r
 \r
     }\r
 \r
 \r

-    public void onSamlDialogSuccess(String sessionCookie) {\r
-        mAuthToken = sessionCookie;\r
-\r
-        if (sessionCookie != null && sessionCookie.length() > 0) {\r
-            mAuthToken = sessionCookie;\r
-            boolean followRedirects = true;\r
-            getRemoteUserNameOperation(sessionCookie, followRedirects);\r
-        }\r
-    }\r
-    \r

     private void getRemoteUserNameOperation(String sessionCookie, boolean followRedirects) {\r
         \r
         Intent getUserNameIntent = new Intent();\r
         getUserNameIntent.setAction(OperationsService.ACTION_GET_USER_NAME);\r
     private void getRemoteUserNameOperation(String sessionCookie, boolean followRedirects) {\r
         \r
         Intent getUserNameIntent = new Intent();\r
         getUserNameIntent.setAction(OperationsService.ACTION_GET_USER_NAME);\r

-        getUserNameIntent.putExtra(OperationsService.EXTRA_SERVER_URL, mHostBaseUrl);\r
+        getUserNameIntent.putExtra(OperationsService.EXTRA_SERVER_URL, mServerInfo.mBaseUrl);\r

         getUserNameIntent.putExtra(OperationsService.EXTRA_COOKIE, sessionCookie);\r
         getUserNameIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
         \r
         if (mOperationsServiceBinder != null) {\r
             //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
         getUserNameIntent.putExtra(OperationsService.EXTRA_COOKIE, sessionCookie);\r
         getUserNameIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
         \r
         if (mOperationsServiceBinder != null) {\r
             //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r

-            mGetUserNameOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r
+            mWaitingForOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r

         }\r
     }\r
 \r
 \r
     @Override\r
         }\r
     }\r
 \r
 \r
     @Override\r

-    public void onSsoFinished(String sessionCookies) {\r
-        if (sessionCookies != null && sessionCookies.length() > 0) {\r
+    public void onSsoFinished(String sessionCookie) {\r
+        if (sessionCookie != null && sessionCookie.length() > 0) {\r

             Log_OC.d(TAG, "Successful SSO - time to save the account");\r
             Log_OC.d(TAG, "Successful SSO - time to save the account");\r

-            onSamlDialogSuccess(sessionCookies);\r
+            mAuthToken = sessionCookie;\r
+            getRemoteUserNameOperation(sessionCookie, true);\r

             Fragment fd = getSupportFragmentManager().findFragmentByTag(SAML_DIALOG_TAG);\r
             if (fd != null && fd instanceof SherlockDialogFragment) {\r
                 Dialog d = ((SherlockDialogFragment)fd).getDialog();\r
             Fragment fd = getSupportFragmentManager().findFragmentByTag(SAML_DIALOG_TAG);\r
             if (fd != null && fd instanceof SherlockDialogFragment) {\r
                 Dialog d = ((SherlockDialogFragment)fd).getDialog();\r


@@ -1666,19 +1672,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
     }\r
 \r
 \r
     }\r
 \r

-    /** Show auth_message \r
-     * \r
-     * @param message\r
-     */\r
-    private void showAuthMessage(String message) {\r
-        mAuthMessage.setVisibility(View.VISIBLE);\r
-        mAuthMessage.setText(message);\r
-    }\r
-\r
-    private void hideAuthMessage() {\r
-        mAuthMessage.setVisibility(View.GONE);\r
-    }\r
-\r

     @Override\r
     public boolean onTouchEvent(MotionEvent event) {\r
         if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType) &&\r
     @Override\r
     public boolean onTouchEvent(MotionEvent event) {\r
         if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType) &&\r


@@ -1703,19 +1696,19 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         ft.addToBackStack(null);\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         ft.addToBackStack(null);\r

-        dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
+        dialog.show(ft, UNTRUSTED_CERT_DIALOG_TAG);\r

     }\r
 \r
     /**\r
      * Show untrusted cert dialog \r
      */\r
     }\r
 \r
     /**\r
      * Show untrusted cert dialog \r
      */\r

-    public void showUntrustedCertDialog(RemoteOperationResult result) {\r
+    private void showUntrustedCertDialog(RemoteOperationResult result) {\r

         // Show a dialog with the certificate info\r
         SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         ft.addToBackStack(null);\r
         // Show a dialog with the certificate info\r
         SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         ft.addToBackStack(null);\r

-        dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
+        dialog.show(ft, UNTRUSTED_CERT_DIALOG_TAG);\r

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


@@ -1747,49 +1740,15 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
 \r
     private void doOnResumeAndBound() {\r
 \r
 \r
     private void doOnResumeAndBound() {\r

-        //Log.wtf(TAG, "registering to listen for operation callbacks" );\r
+        //Log_OC.wtf(TAG, "registering to listen for operation callbacks" );\r

         mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);\r
         mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);\r

+        if (mWaitingForOpId <= Integer.MAX_VALUE) {\r
+            mOperationsServiceBinder.dispatchResultIfFinished((int)mWaitingForOpId, this);\r
+        }\r

         \r
         \r

-        if (mGetServerInfoOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(mGetServerInfoOpId);\r
-            if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                onGetServerInfoFinish(result);\r
-            }\r
-            \r
-        } else if (mOauth2GetAccessTokenOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(\r
-                            mOauth2GetAccessTokenOpId);\r
-            if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                onGetOAuthAccessTokenFinish(result);\r
-            }\r
-            \r
-        } else if (mExistenceCheckOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(mExistenceCheckOpId);\r
-            if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(\r
-                        MainApp.getAccountType()).equals(mAuthTokenType)) {\r
-                    onSamlBasedFederatedSingleSignOnAuthorizationStart(result);\r
-\r
-                } else {\r
-                    onAuthorizationCheckFinish(result);\r
-                }\r
-            }\r
-        }if (mGetUserNameOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(mGetUserNameOpId);\r
-            if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                onGetUserNameFinish(result);\r
-            }\r
-            \r
-        } \r
-        \r
+        if (mPendingAutoCheck) {\r
+            checkOcServer();\r
+        }\r

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