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 6ff9f6a..d9e1bea 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -68,13 +68,12 @@ 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;\r

 import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod;\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.lib.common.network.CertificateCombinedException;\r
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;\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.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.common.operations.RemoteOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r


@@ -124,6 +123,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     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
 \r
     private static final String AUTH_ON = "on";\r
     private static final String AUTH_OFF = "off";\r


@@ -138,21 +140,22 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
     private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r
 \r
 \r
     private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r
 \r

-    private String mHostBaseUrl;\r
-    private OwnCloudVersion mDiscoveredVersion;\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 int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r

-    private ServiceConnection mOperationsConnection = null;\r
-    private OperationsServiceBinder mOperationsBinder = null;\r
-    \r

     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\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


@@ -187,9 +190,12 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private boolean mResumed; // Control if activity is resumed\r
 \r
     public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
     private boolean mResumed; // Control if activity is resumed\r
 \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 DetectAuthenticationMethodOperation mDetectAuthenticationOperation;\r
-\r
+    private GetServerInfoOperation.ServerInfo mServerInfo;\r

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


@@ -202,31 +208,17 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
         // bind to Operations Service\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
         // bind to Operations Service\r

-        mOperationsConnection = new ServiceConnection() {\r
-\r
-            @Override\r
-            public void onServiceConnected(ComponentName name, IBinder service) {\r
-                Log_OC.d(TAG, "Operations service connected");\r
-                mOperationsBinder = (OperationsServiceBinder) service;\r
-            }\r
-\r
-            @Override\r
-            public void onServiceDisconnected(ComponentName name) {\r
-                Log_OC.d(TAG, "Operations service crashed");\r
-                mOperationsBinder = null;\r
-            }\r
-            \r
-        };\r
+        mOperationsServiceConnection = new OperationsServiceConnection();\r

         if (!bindService(new Intent(this, OperationsService.class), \r
         if (!bindService(new Intent(this, OperationsService.class), \r

-                        mOperationsConnection, \r
-                        Context.BIND_AUTO_CREATE)) {\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
             Toast.makeText(this, \r
                     R.string.error_cant_bind_to_operations_service, \r
                     Toast.LENGTH_LONG)\r
                         .show();\r
             finish();\r
         }\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


@@ -345,6 +337,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             refreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);\r
 \r
 \r
             refreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED);\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
         if (mAuthMessageVisibility== View.VISIBLE) {\r
         }\r
 \r
         if (mAuthMessageVisibility== View.VISIBLE) {\r


@@ -366,8 +362,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r
 \r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r
 \r

-        //if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton();\r
-        if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\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


@@ -430,6 +425,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 return false;\r
             }\r
         });\r
                 return false;\r
             }\r
         });\r

+        \r

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


@@ -482,6 +478,7 @@ 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

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


@@ -491,7 +488,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         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


@@ -512,8 +509,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \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
+        \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


@@ -540,7 +539,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\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


@@ -557,17 +558,33 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         if (mNewCapturedUriFromOAuth2Redirection != null) {\r
             getOAuth2AccessTokenFromCapturedRedirection();            \r
         }\r
         if (mNewCapturedUriFromOAuth2Redirection != null) {\r
             getOAuth2AccessTokenFromCapturedRedirection();            \r
         }\r

-\r
+        \r

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

+        if (mOperationsServiceBinder != null) {\r
+            doOnResumeAndBound();\r
+        }\r
+        \r
+        //Log.wtf(TAG, "onResume end" );\r

     }\r
     }\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
     \r
     @Override\r
     protected void onDestroy() {\r

-        if (mOperationsConnection != null) {\r
-            unbindService(mOperationsConnection);\r
-            mOperationsBinder = null;\r
+        if (mOperationsServiceConnection != null) {\r
+            unbindService(mOperationsServiceConnection);\r
+            mOperationsServiceBinder = null;\r

         }\r
         super.onDestroy();\r
     }\r
         }\r
         super.onDestroy();\r
     }\r


@@ -606,7 +623,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 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


@@ -631,32 +648,45 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             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
+        String uri = mHostUrlInput.getText().toString().trim();\r

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

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

         }\r
 \r
         mServerIsValid = false;\r
         mServerIsChecked = false;\r
         mOkButton.setEnabled(false);\r
         mDiscoveredVersion = null;\r
         }\r
 \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


@@ -844,8 +874,11 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     @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


@@ -860,42 +893,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         } else if (operation instanceof GetRemoteUserNameOperation) {\r
             onGetUserNameFinish((GetRemoteUserNameOperation) operation, result);\r
 \r
         } else if (operation instanceof GetRemoteUserNameOperation) {\r
             onGetUserNameFinish((GetRemoteUserNameOperation) operation, result);\r
 \r

-        } else if (operation instanceof DetectAuthenticationMethodOperation) {\r
-            onDetectAutheticationFinish((DetectAuthenticationMethodOperation) operation, result);\r

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

-    private void onDetectAutheticationFinish(DetectAuthenticationMethodOperation operation, RemoteOperationResult result) {\r
-        // Read authentication method\r
-        if (result.getData().size() > 0) {\r
-            AuthenticationMethod authMethod = (AuthenticationMethod) result.getData().get(0);\r
-            String basic = AccountTypeUtils.getAuthTokenTypePass(MainApp.getAccountType());\r
-            String oAuth = AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType());\r
-            String saml =  AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType());\r
-\r
-            if ( ( mAuthTokenType.equals(basic) && !authMethod.equals(AuthenticationMethod.BASIC_HTTP_AUTH) ) ||\r
-                    ( mAuthTokenType.equals(oAuth) && !authMethod.equals(AuthenticationMethod.BEARER_TOKEN) ) || \r
-                    ( mAuthTokenType.equals(saml)  && !authMethod.equals(AuthenticationMethod.SAML_WEB_SSO) ) ) {\r
-\r
-                mOkButton.setEnabled(false);\r
-                mServerIsValid = false;\r
-                //show an alert message ( Server Status )\r
-                updateServerStatusIconNoRegularAuth();\r
-                showServerStatus();\r
-\r
-            } else {\r
-                mOkButton.setEnabled(true);\r
-\r
-                // Show server status\r
-                showServerStatus();\r
-            }\r
-\r
-        }\r
-    }\r
-\r
-\r
-\r

     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
 \r
         if (result.isSuccess()) {\r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
 \r
         if (result.isSuccess()) {\r


@@ -964,62 +965,68 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @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
-\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
 \r

-            /// retrieve discovered version and normalize server URL\r
-            mDiscoveredVersion = operation.getDiscoveredVersion();\r
-            mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
-\r
-            // Refresh server status, but don't show it\r
-            updateServerStatusIconAndText(result);\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
-                // Try to create an account with user and pass "", to know if it is a regular server\r
-                // Update connect button in the answer of this method\r
-                detectAuthorizationMethod();\r

             } else {\r
             } else {\r

-                showRefreshButton();\r
-                // Show server status\r
-                showServerStatus();\r
-            }\r
-\r
-            /// very special case (TODO: move to a common place for all the remote operations)\r
-            if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
-                showUntrustedCertDialog(result);\r
+                mServerIsValid = true;\r

             }\r
             }\r

+            \r
+        } else {\r
+            mServerIsValid = false;\r
+        }\r

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

-    /**\r
-     *  Try to access with  user/pass ""/"", to know if it is a regular server\r
-     */\r
-    private void detectAuthorizationMethod() {\r
-\r
-        Log_OC.d(TAG, "Trying empty authorization to detect authentication method");\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
-        /// test credentials \r
-        mDetectAuthenticationOperation = new DetectAuthenticationMethodOperation(this);\r
-        OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);\r
-        mOperationThread = mDetectAuthenticationOperation.execute(client, this, mHandler);\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


@@ -1044,6 +1051,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\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


@@ -1297,7 +1305,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             mServerIsChecked = true;\r
             mServerIsValid = false;\r
             mIsSslConn = false;\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


@@ -1309,7 +1317,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             showAuthStatus();\r
 \r
             // update input controls state\r
             showAuthStatus();\r
 \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


@@ -1564,12 +1572,12 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }     \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


@@ -1841,5 +1849,49 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         }\r
 \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
 \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