Moved execution of GetServerInfoOperation into OperationsService

[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 32bcf54..d9e1bea 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -25,8 +25,11 @@ import android.accounts.AccountManager;
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.app.ProgressDialog;\r

+import android.content.ComponentName;\r
+import android.content.Context;\r

 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r

+import android.content.ServiceConnection;\r

 import android.content.SharedPreferences;\r
 import android.graphics.Rect;\r
 import android.graphics.drawable.Drawable;\r
 import android.content.SharedPreferences;\r
 import android.graphics.Rect;\r
 import android.graphics.drawable.Drawable;\r


@@ -34,6 +37,7 @@ import android.net.Uri;
 import android.net.http.SslError;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.net.http.SslError;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r

+import android.os.IBinder;\r

 import android.preference.PreferenceManager;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r
 import android.preference.PreferenceManager;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r


@@ -48,11 +52,13 @@ import android.view.View.OnFocusChangeListener;
 import android.view.View.OnTouchListener;\r
 import android.view.Window;\r
 import android.view.inputmethod.EditorInfo;\r
 import android.view.View.OnTouchListener;\r
 import android.view.Window;\r
 import android.view.inputmethod.EditorInfo;\r

+import android.webkit.SslErrorHandler;\r

 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r

+import android.widget.Toast;\r

 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.MainApp;\r
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.MainApp;\r


@@ -62,20 +68,23 @@ import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;\r
 import com.owncloud.android.lib.common.OwnCloudClientFactory;\r
 import com.owncloud.android.lib.common.OwnCloudClient;\r
 import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;\r
 import com.owncloud.android.lib.common.OwnCloudClientFactory;\r
 import com.owncloud.android.lib.common.OwnCloudClient;\r

+import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod;\r
+import com.owncloud.android.operations.GetServerInfoOperation;\r

 import com.owncloud.android.operations.OAuth2GetAccessToken;\r
 
 import com.owncloud.android.operations.OAuth2GetAccessToken;\r
 

+import com.owncloud.android.lib.common.network.CertificateCombinedException;\r

 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;\r

-import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation;\r

 import com.owncloud.android.lib.common.operations.RemoteOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r

-
+\r
+import com.owncloud.android.services.OperationsService;\r
+import com.owncloud.android.services.OperationsService.OperationsServiceBinder;\r

 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r

-import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r

 import com.owncloud.android.utils.Log_OC;\r
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
 \r
 import com.owncloud.android.utils.Log_OC;\r
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
 \r


@@ -86,8 +95,8 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r

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

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


@@ -114,11 +123,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     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_IS_SHARED_SUPPORTED = "KEY_IS_SHARE_SUPPORTED";\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_IS_SHARED_SUPPORTED = "KEY_IS_SHARE_SUPPORTED";\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
+\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 String AUTH_ON = "on";\r
     private static final String AUTH_OFF = "off";\r
     private static final String AUTH_OPTIONAL = "optional";\r

-    \r
+\r

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


@@ -127,19 +139,23 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r
     private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\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;                // 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
 \r
     private String mAuthMessageText;\r
     private int mAuthMessageVisibility, mServerStatusText, mServerStatusIcon;\r
     private boolean mServerIsChecked, mServerIsValid, mIsSslConn;\r

+    private AuthenticationMethod mServerAuthMethod = AuthenticationMethod.UNKNOWN;\r
+    private int mGetServerInfoOpId = -1;\r
+\r

     private int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r
     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r
     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r

-    private GetRemoteStatusOperation mOcServerChkOperation;\r
+    //private GetRemoteStatusOperation mOcServerChkOperation;\r
+    private GetServerInfoOperation mServerInfoOperation;\r

     private ExistenceCheckRemoteOperation mAuthCheckOperation;\r
 \r
     private Uri mNewCapturedUriFromOAuth2Redirection;\r
     private ExistenceCheckRemoteOperation mAuthCheckOperation;\r
 \r
     private Uri mNewCapturedUriFromOAuth2Redirection;\r


@@ -150,31 +166,36 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private Account mAccount;\r
 \r
     private TextView mAuthMessage;\r
     private Account mAccount;\r
 \r
     private TextView mAuthMessage;\r

-    \r
+\r

     private EditText mHostUrlInput;\r
     private boolean mHostUrlInputEnabled;\r
     private View mRefreshButton;\r
 \r
     private String mAuthTokenType;\r
     private EditText mHostUrlInput;\r
     private boolean mHostUrlInputEnabled;\r
     private View mRefreshButton;\r
 \r
     private String mAuthTokenType;\r

-    \r
+\r

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

-    \r
+\r

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

-    \r
+\r

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

-    \r
+\r

     private SamlWebViewDialog mSamlDialog;\r
     private SamlWebViewDialog mSamlDialog;\r

-    \r
+\r

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

-    \r
+\r

     private String mAuthToken;\r
     private String mAuthToken;\r

-    \r
+\r

     private boolean mResumed; // Control if activity is resumed\r
 \r
     private boolean mResumed; // Control if activity is resumed\r
 \r

-    private String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
+    public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
+    \r
+    private ServiceConnection mOperationsServiceConnection = null;\r
+    \r
+    private OperationsServiceBinder mOperationsServiceBinder = null;\r

 \r
 \r

+    private GetServerInfoOperation.ServerInfo mServerInfo;\r

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


@@ -186,6 +207,18 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r

+        // bind to Operations Service\r
+        mOperationsServiceConnection = new OperationsServiceConnection();\r
+        if (!bindService(new Intent(this, OperationsService.class), \r
+                mOperationsServiceConnection, \r
+                Context.BIND_AUTO_CREATE)) {\r
+            Toast.makeText(this, \r
+                    R.string.error_cant_bind_to_operations_service, \r
+                    Toast.LENGTH_LONG)\r
+                        .show();\r
+            finish();\r
+        }\r
+                \r

         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mAuthMessage = (TextView) findViewById(R.id.auth_message);\r
         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mAuthMessage = (TextView) findViewById(R.id.auth_message);\r


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

-        \r
+\r

         /// set Host Url Input Enabled\r
         mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);\r
         /// set Host Url Input Enabled\r
         mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);\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
         /// 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


@@ -221,7 +254,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mAccount = null;\r
         mHostBaseUrl = "";\r
         boolean refreshButtonEnabled = false;\r
         mAccount = null;\r
         mHostBaseUrl = "";\r
         boolean refreshButtonEnabled = false;\r

-        \r
+\r

         // URL input configuration applied\r
         if (!mHostUrlInputEnabled)\r
         {\r
         // URL input configuration applied\r
         if (!mHostUrlInputEnabled)\r
         {\r


@@ -254,15 +287,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mHostUrlInput.setText(mHostBaseUrl);\r
                 String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
                 mUsernameInput.setText(userName);
                 mHostUrlInput.setText(mHostBaseUrl);\r
                 String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
                 mUsernameInput.setText(userName);

-                \r
+\r

             }\r
             initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
             mJustCreated = true;\r
             }\r
             initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
             mJustCreated = true;\r

-            \r
+\r

             if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r
                 checkOcServer(); \r
             }\r
             if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r
                 checkOcServer(); \r
             }\r

-            \r
+\r

         } else {\r
             mResumed = true;\r
             /// connection state and info\r
         } else {\r
             mResumed = true;\r
             /// connection state and info\r


@@ -278,7 +311,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (savedInstanceState.getBoolean(KEY_PASSWORD_VISIBLE, false)) {\r
                 showPassword();\r
             }\r
             if (savedInstanceState.getBoolean(KEY_PASSWORD_VISIBLE, false)) {\r
                 showPassword();\r
             }\r

-            \r
+\r

             /// server data\r
             String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
             String ocVersionString = savedInstanceState.getString(KEY_OC_VERSION_STRING);\r
             /// server data\r
             String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
             String ocVersionString = savedInstanceState.getString(KEY_OC_VERSION_STRING);\r


@@ -292,17 +325,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             if (mAuthTokenType == null) {\r
                 mAuthTokenType =  AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
             mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             if (mAuthTokenType == null) {\r
                 mAuthTokenType =  AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r

-                \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
 \r
             // check if server check was interrupted by a configuration change\r
             if (savedInstanceState.getBoolean(KEY_SERVER_CHECK_IN_PROGRESS, false)) {\r
                 checkOcServer();\r
             }            \r

-            \r
+\r

             // refresh button enabled\r
             refreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);\r
             // refresh button enabled\r
             refreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);\r

-            \r
+\r
+\r
+            mServerAuthMethod = AuthenticationMethod.valueOf(\r
+                    savedInstanceState.getString(KEY_SERVER_AUTH_METHOD));\r
+            mGetServerInfoOpId = savedInstanceState.getInt(KEY_DETECT_AUTH_OP_ID);\r

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


@@ -315,7 +352,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         adaptViewAccordingToAuthenticationMethod();\r
         showServerStatus();\r
         showAuthStatus();\r
         adaptViewAccordingToAuthenticationMethod();\r
         showServerStatus();\r
         showAuthStatus();\r

-        \r
+\r

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


@@ -324,9 +361,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mUsernameInput.setFocusable(false);\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r
             mUsernameInput.setFocusable(false);\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r

-        \r
-        //if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton();\r
-        if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\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
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
 \r
         if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType) || \r


@@ -363,7 +399,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mResumed = false;\r
             }\r
         });\r
                 mResumed = false;\r
             }\r
         });\r

-        \r
+\r

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


@@ -376,7 +412,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 return true;\r
             }\r
         });\r
                 return true;\r
             }\r
         });\r

-        \r
+\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


@@ -389,9 +425,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 return false;\r
             }\r
         });\r
                 return false;\r
             }\r
         });\r

+        \r

     }\r
     }\r

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

 \r
     private void initAuthorizationMethod() {\r
         boolean oAuthRequired = false;\r
 \r
     private void initAuthorizationMethod() {\r
         boolean oAuthRequired = false;\r


@@ -399,15 +436,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
         mAuthTokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
         mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
 \r
         mAuthTokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
         mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r

-        \r
+\r

         // TODO could be a good moment to validate the received token type, if not null\r
         // TODO could be a good moment to validate the received token type, if not null\r

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

             } else {\r
                 /// use the one set in setup.xml\r
                 oAuthRequired = AUTH_ON.equals(getString(R.string.auth_method_oauth2));\r
             } else {\r
                 /// use the one set in setup.xml\r
                 oAuthRequired = AUTH_ON.equals(getString(R.string.auth_method_oauth2));\r


@@ -421,14 +458,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mAuthTokenType = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
             }\r
         }\r
                 mAuthTokenType = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
             }\r
         }\r

-    \r
+\r

         if (mAccount != null) {\r
             String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
             mUsernameInput.setText(userName);\r
         }\r
         if (mAccount != null) {\r
             String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
             mUsernameInput.setText(userName);\r
         }\r

-        \r
+\r

         mOAuth2Check.setChecked(AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType));\r
         mOAuth2Check.setChecked(AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(mAuthTokenType));\r

-        \r
+\r

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


@@ -441,6 +478,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
      */\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r

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

         super.onSaveInstanceState(outState);\r
 \r
         /// connection state and info\r
         super.onSaveInstanceState(outState);\r
 \r
         /// connection state and info\r


@@ -450,7 +488,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);\r
         outState.putBoolean(KEY_SERVER_VALID, mServerIsValid);\r
         outState.putBoolean(KEY_SERVER_CHECKED, mServerIsChecked);\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_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.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);\r
         outState.putBoolean(KEY_PASSWORD_VISIBLE, isPasswordVisible());\r
         outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);\r


@@ -468,11 +506,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             outState.putParcelable(KEY_ACCOUNT, mAccount);\r
         }\r
         outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mAuthTokenType);\r
             outState.putParcelable(KEY_ACCOUNT, mAccount);\r
         }\r
         outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mAuthTokenType);\r

-        \r
+\r

         // refresh button enabled\r
         outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r
         \r
         // refresh button enabled\r
         outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r
         \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

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


@@ -499,7 +539,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */\r
     @Override\r
     protected void onResume() {\r
      */\r
     @Override\r
     protected void onResume() {\r

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

         super.onResume();\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
         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


@@ -516,9 +558,35 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         if (mNewCapturedUriFromOAuth2Redirection != null) {\r
             getOAuth2AccessTokenFromCapturedRedirection();            \r
         }\r
         if (mNewCapturedUriFromOAuth2Redirection != null) {\r
             getOAuth2AccessTokenFromCapturedRedirection();            \r
         }\r

-\r
+        \r

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

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

         \r
         \r

+        //Log.wtf(TAG, "onResume end" );\r
+    }\r
+\r
+    \r
+    @Override\r
+    protected void onPause() {\r
+        //Log.wtf(TAG, "onPause init" );\r
+        if (mOperationsServiceBinder != null) {\r
+            //Log.wtf(TAG, "unregistering to listen for operation callbacks" );\r
+            mOperationsServiceBinder.removeOperationListener(this);\r
+        }\r
+        super.onPause();\r
+        //Log.wtf(TAG, "onPause end" );\r
+    }\r
+    \r
+    @Override\r
+    protected void onDestroy() {\r
+        if (mOperationsServiceConnection != null) {\r
+            unbindService(mOperationsServiceConnection);\r
+            mOperationsServiceBinder = null;\r
+        }\r
+        super.onDestroy();\r

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


@@ -555,7 +623,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 onUrlInputFocusLost((TextView) view);\r
             }\r
             else {\r
                 onUrlInputFocusLost((TextView) view);\r
             }\r
             else {\r

-                hideRefreshButton();\r
+                showRefreshButton(false);\r

             }\r
 \r
         } else if (view.getId() == R.id.account_password) {\r
             }\r
 \r
         } else if (view.getId() == R.id.account_password) {\r


@@ -580,32 +648,45 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             checkOcServer();\r
         } else {\r
             mOkButton.setEnabled(mServerIsValid);\r
             checkOcServer();\r
         } else {\r
             mOkButton.setEnabled(mServerIsValid);\r

-            if (!mServerIsValid) {\r
-                showRefreshButton();\r
-            }\r
+            showRefreshButton(!mServerIsValid);\r

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

-        String uri = trimUrlWebdav(mHostUrlInput.getText().toString().trim());\r
-        \r
+        String uri = mHostUrlInput.getText().toString().trim();\r
+\r

         if (!mHostUrlInputEnabled){\r
         if (!mHostUrlInputEnabled){\r

-            uri = getString(R.string.server_url);\r
+            uri = getString(R.string.server_url).trim();\r

         }\r
         }\r

-        \r
+\r

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

-        hideRefreshButton();\r
+        mServerAuthMethod = AuthenticationMethod.UNKNOWN;\r
+        showRefreshButton(false);\r
+        \r

         if (uri.length() != 0) {\r
             mServerStatusText = R.string.auth_testing_connection;\r
             mServerStatusIcon = R.drawable.progress_small;\r
             showServerStatus();\r
         if (uri.length() != 0) {\r
             mServerStatusText = R.string.auth_testing_connection;\r
             mServerStatusIcon = R.drawable.progress_small;\r
             showServerStatus();\r

-            mOcServerChkOperation = new  GetRemoteStatusOperation(uri, this);\r
+            \r
+            /*\r
+            mServerInfoOperation = new GetServerInfoOperation(uri, mAuthTokenType, this);\r

             OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(uri), this, true);\r
             OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(uri), this, true);\r

-            mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);\r
+            mServerInfoOperation.execute(client, this, mHandler);\r
+            */\r
+            \r
+            Intent getServerInfoIntent = new Intent();\r
+            getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);\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
+            }\r
+            \r

         } else {\r
             mServerStatusText = 0;\r
             mServerStatusIcon = 0;\r
         } else {\r
             mServerStatusText = 0;\r
             mServerStatusIcon = 0;\r


@@ -647,7 +728,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private boolean isPasswordVisible() {\r
         return ((mPasswordInput.getInputType() & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
     }\r
     private boolean isPasswordVisible() {\r
         return ((mPasswordInput.getInputType() & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
     }\r

-    \r
+\r

     private void hidePasswordButton() {\r
         mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
     }\r
     private void hidePasswordButton() {\r
         mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
     }\r


@@ -656,13 +737,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
         showViewPasswordButton();\r
     }\r
         mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
         showViewPasswordButton();\r
     }\r

-    \r
+\r

     private void hidePassword() {\r
         mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
         showViewPasswordButton();\r
     }\r
     private void hidePassword() {\r
         mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
         showViewPasswordButton();\r
     }\r

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

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


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

-        \r
+\r

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


@@ -774,7 +855,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mAuthStatusText = R.string.auth_connecting_auth_server;\r
         showAuthStatus();\r
         showDialog(DIALOG_LOGIN_PROGRESS);\r
         mAuthStatusText = R.string.auth_connecting_auth_server;\r
         showAuthStatus();\r
         showDialog(DIALOG_LOGIN_PROGRESS);\r

-        \r
+\r

         /// get the path to the root folder through WebDAV from the version server\r
         String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
 \r
         /// get the path to the root folder through WebDAV from the version server\r
         String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
 \r


@@ -782,7 +863,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mAuthCheckOperation = new  ExistenceCheckRemoteOperation("", this, false);\r
         OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);\r
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
         mAuthCheckOperation = new  ExistenceCheckRemoteOperation("", this, false);\r
         OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);\r
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r

-      \r
+\r

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


@@ -793,8 +874,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     @Override\r
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
 \r
     @Override\r
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
 \r

-        if (operation instanceof GetRemoteStatusOperation) {\r
-            onOcServerCheckFinish((GetRemoteStatusOperation) operation, result);\r
+        if (operation instanceof GetServerInfoOperation) {\r
+            if (operation.hashCode() == mGetServerInfoOpId) {\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

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


@@ -802,27 +886,28 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         } else if (operation instanceof ExistenceCheckRemoteOperation)  {\r
             if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                 onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);\r
         } else if (operation instanceof ExistenceCheckRemoteOperation)  {\r
             if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                 onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);\r

-                \r
+\r

             } else {\r
                 onAuthorizationCheckFinish((ExistenceCheckRemoteOperation)operation, result);\r
             }\r
         } else if (operation instanceof GetRemoteUserNameOperation) {\r
             onGetUserNameFinish((GetRemoteUserNameOperation) operation, result);\r
             } else {\r
                 onAuthorizationCheckFinish((ExistenceCheckRemoteOperation)operation, result);\r
             }\r
         } else if (operation instanceof GetRemoteUserNameOperation) {\r
             onGetUserNameFinish((GetRemoteUserNameOperation) operation, result);\r

-             \r
+\r

         }\r
         }\r

-        \r
+\r

     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r

+\r

         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r
         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r

-            \r
+\r

             if ( mAction == ACTION_CREATE) {\r
                 mUsernameInput.setText(username);\r
                 success = createAccount();\r
             } else {\r
             if ( mAction == ACTION_CREATE) {\r
                 mUsernameInput.setText(username);\r
                 success = createAccount();\r
             } else {\r

-                \r
+\r

                 if (!mUsernameInput.getText().toString().equals(username)) {\r
                     // fail - not a new account, but an existing one; disallow\r
                     result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_THE_SAME); \r
                 if (!mUsernameInput.getText().toString().equals(username)) {\r
                     // fail - not a new account, but an existing one; disallow\r
                     result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_THE_SAME); \r


@@ -830,19 +915,19 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                     showAuthStatus();\r
                     Log_OC.d(TAG, result.getLogMessage());\r
                 } else {\r
                     showAuthStatus();\r
                     Log_OC.d(TAG, result.getLogMessage());\r
                 } else {\r

-                  updateToken();\r
-                  success = true;\r
+                    updateToken();\r
+                    success = true;\r

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

-            \r
+\r

             if (success)\r
                 finish();\r
         } else {\r
             if (success)\r
                 finish();\r
         } else {\r

-            updateAuthStatusIconAndText(result);\r
+            updateStatusIconFailUserName();\r

             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r
             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r

-        \r
+\r

     }\r
 \r
     private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperation operation, RemoteOperationResult result) {\r
     }\r
 \r
     private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperation operation, RemoteOperationResult result) {\r


@@ -851,23 +936,23 @@ 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

-        
+

         //if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
         if (result.isIdPRedirection()) {
             String url = result.getRedirectedLocation();\r
             String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
         //if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
         if (result.isIdPRedirection()) {
             String url = result.getRedirectedLocation();\r
             String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r

-            \r
+\r

             // Show dialog\r
             mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
             mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);\r
             // Show dialog\r
             mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
             mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);\r

-            \r
+\r

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

-            \r
+\r

         } else {\r
             mAuthStatusIcon = R.drawable.common_error;\r
             mAuthStatusText = R.string.auth_unsupported_auth_method;\r
         } else {\r
             mAuthStatusIcon = R.drawable.common_error;\r
             mAuthStatusText = R.string.auth_unsupported_auth_method;\r

-            \r
+\r

         }\r
         showAuthStatus();\r
     }\r
         }\r
         showAuthStatus();\r
     }\r


@@ -880,40 +965,68 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param operation     Server check performed.\r
      * @param result        Result of the check.\r
      */\r
      * @param operation     Server check performed.\r
      * @param result        Result of the check.\r
      */\r

-    private void onOcServerCheckFinish(GetRemoteStatusOperation operation, RemoteOperationResult result) {\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
+    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
+        \r
+        // update server status, but don't show it yet\r
+        updateServerStatusIconAndText(result);\r
+\r
+        if (result.isSuccess()) {\r
+            /// SUCCESS means:\r
+            //      1. connection succeeded, and we know if it's SSL or not\r
+            //      2. server is installed\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
+            if (!authSupported(mServerAuthMethod)) {\r
+                \r
+                updateServerStatusIconNoRegularAuth();  // overrides updateServerStatusIconAndText()  \r
+                mServerIsValid = false;\r

 \r
 \r

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

             } else {\r
             } else {\r

-                showRefreshButton();\r
+                mServerIsValid = true;\r

             }\r
             }\r

-            updateServerStatusIconAndText(result);\r
-            showServerStatus();\r
+            \r
+        } else {\r
+            mServerIsValid = false;\r
+        }\r

 \r
 \r

-            /// very special case (TODO: move to a common place for all the remote operations)\r
-            if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
-                showUntrustedCertDialog(result);\r
-            }\r
+        // refresh UI\r
+        showRefreshButton(!mServerIsValid);\r
+        showServerStatus();\r
+        mOkButton.setEnabled(mServerIsValid);\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
+            showUntrustedCertDialog(result);\r
+        }\r
+    }\r

 \r
 \r

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

 \r
 \r

-            /// allow or not the user try to access the server\r
-            mOkButton.setEnabled(mServerIsValid);\r
-            \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
+    private boolean authSupported(AuthenticationMethod authMethod) {\r
+        String basic = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
+        String oAuth = AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType());\r
+        String saml =  AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType());\r
+        \r
+        return (( mAuthTokenType.equals(basic) && \r
+                    authMethod.equals(AuthenticationMethod.BASIC_HTTP_AUTH) ) ||\r
+                ( mAuthTokenType.equals(oAuth) && \r
+                    authMethod.equals(AuthenticationMethod.BEARER_TOKEN)) ||\r
+                ( mAuthTokenType.equals(saml)  && \r
+                    authMethod.equals(AuthenticationMethod.SAML_WEB_SSO))\r
+        );\r

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

+    // TODO remove, if possible\r

     private String normalizeUrl(String url) {\r
         if (url != null && url.length() > 0) {\r
             url = url.trim();\r
     private String normalizeUrl(String url) {\r
         if (url != null && url.length() > 0) {\r
             url = url.trim();\r


@@ -938,6 +1051,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
 \r
     }\r
 \r
 \r

+    // TODO remove, if possible\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
     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


@@ -948,8 +1062,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         } \r
         return (url != null ? url : "");\r
     }\r
         } \r
         return (url != null ? url : "");\r
     }\r

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

     /**\r
      * Chooses the right icon and text to show to the user for the received operation result.\r
      * \r
     /**\r
      * Chooses the right icon and text to show to the user for the received operation result.\r
      * \r


@@ -1110,6 +1224,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
 \r
     }\r
 \r
 \r

+    private void updateStatusIconFailUserName(){\r
+        mAuthStatusIcon = R.drawable.common_error;\r
+        mAuthStatusText = R.string.auth_fail_get_user_name;\r
+    }\r
+\r
+    private void updateServerStatusIconNoRegularAuth(){\r
+        mServerStatusIcon = R.drawable.common_error;\r
+        mServerStatusText = R.string.auth_can_not_auth_against_server;\r
+    }\r
+\r

     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r
     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r


@@ -1175,13 +1299,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (success) {\r
                 finish();\r
             }\r
             if (success) {\r
                 finish();\r
             }\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
             mServerIsChecked = true;\r
             mServerIsValid = false;\r
             mIsSslConn = false;\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
+            mServerInfoOperation = null;\r

             mDiscoveredVersion = null;\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
 \r
             mDiscoveredVersion = null;\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
 \r


@@ -1191,9 +1315,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mAuthStatusIcon = 0;\r
             mAuthStatusText = 0;\r
             showAuthStatus();\r
             mAuthStatusIcon = 0;\r
             mAuthStatusText = 0;\r
             showAuthStatus();\r

-            \r
+\r

             // update input controls state\r
             // update input controls state\r

-            showRefreshButton();\r
+            showRefreshButton(true);\r

             mOkButton.setEnabled(false);\r
 \r
             // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r
             mOkButton.setEnabled(false);\r
 \r
             // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r


@@ -1206,10 +1330,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             showAuthStatus();\r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r
             showAuthStatus();\r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r

-\r

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


@@ -1218,24 +1343,24 @@ 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

-        \r
+\r

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

-            \r
+\r

         } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
         } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r

-            \r
+\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, mAuthTokenType, mAuthToken);\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, mAuthTokenType, mAuthToken);\r

-            \r
+\r

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

-        \r
+\r

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


@@ -1268,15 +1393,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             showAuthStatus();\r
             Log_OC.d(TAG, result.getLogMessage());\r
             return false;\r
             showAuthStatus();\r
             Log_OC.d(TAG, result.getLogMessage());\r
             return false;\r

-            \r
+\r

         } else {\r
         } else {\r

-        \r
+\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
             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

-    \r
+\r

             /// add the new account as default in preferences, if there is none already\r
             Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this);\r
             if (defaultAccount == null) {\r
             /// add the new account as default in preferences, if there is none already\r
             Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this);\r
             if (defaultAccount == null) {\r


@@ -1285,7 +1410,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 editor.putString("select_oc_account", accountName);\r
                 editor.commit();\r
             }\r
                 editor.putString("select_oc_account", accountName);\r
                 editor.commit();\r
             }\r

-    \r
+\r

             /// prepare result to return to the Authenticator\r
             //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done\r
             final Intent intent = new Intent();       \r
             /// prepare result to return to the Authenticator\r
             //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done\r
             final Intent intent = new Intent();       \r


@@ -1301,16 +1426,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION,         mDiscoveredVersion.getVersion());\r
             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION_STRING,  mDiscoveredVersion.getVersionString());\r
             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_BASE_URL,   mHostBaseUrl);\r
             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION,         mDiscoveredVersion.getVersion());\r
             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION_STRING,  mDiscoveredVersion.getVersionString());\r
             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_BASE_URL,   mHostBaseUrl);\r

-            
+

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

-    \r
+\r

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

-    \r
+\r

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


@@ -1447,12 +1572,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }     \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
+    private void showRefreshButton (boolean show) {\r
+        if (show)  {\r
+            mRefreshButton.setVisibility(View.VISIBLE);\r
+        } else {\r
+            mRefreshButton.setVisibility(View.GONE);\r
+        }\r

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


@@ -1465,8 +1590,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public void onRefreshClick(View view) {\r
         checkOcServer();\r
     }\r
     public void onRefreshClick(View view) {\r
         checkOcServer();\r
     }\r

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

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


@@ -1501,7 +1626,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         adaptViewAccordingToAuthenticationMethod();\r
     }\r
 \r
         adaptViewAccordingToAuthenticationMethod();\r
     }\r
 \r

-    \r
+\r

     /**\r
      * Changes the visibility of input elements depending on\r
      * the current authorization method.\r
     /**\r
      * Changes the visibility of input elements depending on\r
      * the current authorization method.\r


@@ -1513,7 +1638,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r

-            \r
+\r

         } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
             // SAML-based web Single Sign On\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r
         } else if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
             // SAML-based web Single Sign On\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r


@@ -1528,26 +1653,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mPasswordInput.setVisibility(View.VISIBLE);\r
         }\r
     }\r
             mPasswordInput.setVisibility(View.VISIBLE);\r
         }\r
     }\r

-    \r
-    /**\r
-     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
-     */\r
-    public void onSavedCertificate() {\r
-        checkOcServer();\r
-        reloadWebView();\r
-        \r
-    }\r
-\r
-    /**\r
-     * Called from SslValidatorDialog when a new server certificate could not be saved \r
-     * when the user requested it.\r
-     */\r
-    @Override\r
-    public void onFailedSavingCertificate() {\r
-        showDialog(DIALOG_CERT_NOT_SAVED);\r
-        cancelWebView();\r
-    }\r
-\r

 \r
     /**\r
      *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
 \r
     /**\r
      *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r


@@ -1561,7 +1666,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (mOkButton.isEnabled()) {\r
                 mOkButton.performClick();\r
             }\r
             if (mOkButton.isEnabled()) {\r
                 mOkButton.performClick();\r
             }\r

-            \r
+\r

         } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null && inputField.equals(mHostUrlInput)) {\r
             if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                 checkOcServer();\r
         } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null && inputField.equals(mHostUrlInput)) {\r
             if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                 checkOcServer();\r


@@ -1574,7 +1679,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {\r
 \r
         private int fuzz = 75;\r
     private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {\r
 \r
         private int fuzz = 75;\r

-        \r
+\r

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


@@ -1592,8 +1697,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 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
                 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
+                        && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) {\r
+\r

                     return onDrawableTouch(event);\r
                 }\r
             }\r
                     return onDrawableTouch(event);\r
                 }\r
             }\r


@@ -1606,7 +1711,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
     public void onSamlDialogSuccess(String sessionCookie) {\r
         mAuthToken = sessionCookie;\r
 \r
     public void onSamlDialogSuccess(String sessionCookie) {\r
         mAuthToken = sessionCookie;\r

-        \r
+\r

         if (sessionCookie != null && sessionCookie.length() > 0) {\r
             mAuthToken = sessionCookie;\r
 \r
         if (sessionCookie != null && sessionCookie.length() > 0) {\r
             mAuthToken = sessionCookie;\r
 \r


@@ -1616,7 +1721,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             getUserOperation.execute(client, this, mHandler);\r
         }\r
 \r
             getUserOperation.execute(client, this, mHandler);\r
         }\r
 \r

-            \r
+\r

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


@@ -1639,18 +1744,18 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             // TODO - show fail\r
             Log_OC.d(TAG, "SSO failed");\r
         }\r
             // TODO - show fail\r
             Log_OC.d(TAG, "SSO failed");\r
         }\r

-    \r
+\r

     }\r
     }\r

-    \r
+\r

     /** Show auth_message \r
      * \r
      * @param message\r
      */\r
     private void showAuthMessage(String message) {\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
+        mAuthMessage.setVisibility(View.VISIBLE);\r
+        mAuthMessage.setText(message);\r

     }\r
     }\r

-    \r
+\r

     private void hideAuthMessage() {\r
         mAuthMessage.setVisibility(View.GONE);\r
     }\r
     private void hideAuthMessage() {\r
         mAuthMessage.setVisibility(View.GONE);\r
     }\r


@@ -1665,63 +1770,128 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
 \r
     }\r
 \r
 \r

-\r
-    public void cancelWebView() {\r
-        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
-        if (fd != null && fd instanceof SherlockDialogFragment) {\r
-            Dialog d = ((SherlockDialogFragment)fd).getDialog();\r
-            if (d != null && d.isShowing()) {\r
-                d.dismiss();\r
-            }\r
-        }\r
-        \r
-    }\r
-\r
-    public void reloadWebView() {\r
-        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
-        if (fd != null && fd instanceof SamlWebViewDialog) {\r
-                ((SamlWebViewDialog) fd).reloadWebView();\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public void onCancelCertificate() {\r
-        cancelWebView();\r
-    }\r
-    \r

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

-    public void showUntrustedCertDialog(X509Certificate x509Certificate, SslError error) {\r
+    public void showUntrustedCertDialog(X509Certificate x509Certificate, SslError error, SslErrorHandler handler) {\r

         // Show a dialog with the certificate info\r
         // Show a dialog with the certificate info\r

-        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstance(x509Certificate, error);\r
+        SslUntrustedCertDialog dialog = null;\r
+        if (x509Certificate == null) {\r
+            dialog = SslUntrustedCertDialog.newInstanceForEmptySslError(error, handler);\r
+        } else {\r
+            dialog = SslUntrustedCertDialog.newInstanceForFullSslError(x509Certificate, error, handler);\r
+        }\r

         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r

+        ft.addToBackStack(null);\r

         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r

-        \r

     }\r
     }\r

-    \r
+\r

     /**\r
      * Show untrusted cert dialog \r
      */\r
     public void showUntrustedCertDialog(RemoteOperationResult result) {\r
         // Show a dialog with the certificate info\r
     /**\r
      * Show untrusted cert dialog \r
      */\r
     public void showUntrustedCertDialog(RemoteOperationResult result) {\r
         // Show a dialog with the certificate info\r

-        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstance(result, this);\r
+        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r

         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r

+        ft.addToBackStack(null);\r

         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r

-        \r
+\r

     }\r
     }\r

-    \r
+\r

     /**\r
      * Dismiss untrusted cert dialog\r
      */\r
     public void dismissUntrustedCertDialog(){\r
     /**\r
      * Dismiss untrusted cert dialog\r
      */\r
     public void dismissUntrustedCertDialog(){\r

-        Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_UNTRUSTED_CERT);\r
+        /*Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_UNTRUSTED_CERT);\r

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

-            SslUntrustedCertDialog dialog = (SslUntrustedCertDialog) frag;\r
+            SslErrorViewAdapter dialog = (SslErrorViewAdapter) frag;\r

             dialog.dismiss();\r
         }\r
             dialog.dismiss();\r
         }\r

+         */\r
+    }\r
+\r
+    /**\r
+     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
+     */\r
+    public void onSavedCertificate() {\r
+        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
+        if (fd == null) {\r
+            // if SAML dialog is not shown, the SslDialog was shown due to an SSL error in the server check\r
+            checkOcServer();\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Called from SslValidatorDialog when a new server certificate could not be saved \r
+     * when the user requested it.\r
+     */\r
+    @Override\r
+    public void onFailedSavingCertificate() {\r
+        showDialog(DIALOG_CERT_NOT_SAVED);\r
+        cancelWebView();\r
+    }\r
+\r
+    @Override\r
+    public void onCancelCertificate() {\r
+        cancelWebView();\r
+    }\r
+\r
+\r
+    public void cancelWebView() {\r
+        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
+        if (fd != null && fd instanceof SherlockDialogFragment) {\r
+            Dialog d = ((SherlockDialogFragment)fd).getDialog();\r
+            if (d != null && d.isShowing()) {\r
+                d.dismiss();\r
+            }\r
+        }\r
+\r
+    }\r
+    \r
+    \r
+    private void doOnResumeAndBound() {\r
+        //Log.wtf(TAG, "registering to listen for operation callbacks" );\r
+        mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);\r
+        \r
+        if (mGetServerInfoOpId != -1) {\r
+            RemoteOperationResult result = \r
+                    mOperationsServiceBinder.getOperationResultIfFinished(mGetServerInfoOpId);\r
+            if (result != null) {\r
+                //Log.wtf(TAG, "found result of operation finished while rotating");\r
+                onGetServerInfoFinish(result);\r
+            }\r
+        }\r
+    }\r
+    \r
+    /** \r
+     * Implements callback methods for service binding. \r
+     */\r
+    private class OperationsServiceConnection implements ServiceConnection {\r
+\r
+        @Override\r
+        public void onServiceConnected(ComponentName component, IBinder service) {\r
+            if (component.equals(new ComponentName(AuthenticatorActivity.this, OperationsService.class))) {\r
+                //Log_OC.wtf(TAG, "Operations service connected");\r
+                mOperationsServiceBinder = (OperationsServiceBinder) service;\r
+                \r
+                doOnResumeAndBound();\r
+                \r
+            } else {\r
+                return;\r
+            }\r
+            \r
+        }\r
+\r
+        @Override\r
+        public void onServiceDisconnected(ComponentName component) {\r
+            if (component.equals(new ComponentName(AuthenticatorActivity.this, OperationsService.class))) {\r
+                Log_OC.e(TAG, "Operations service crashed");\r
+                mOperationsServiceBinder = null;\r
+            }\r
+        }\r
+    \r

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