Update server-url

[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 50360c0..d844011 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -18,24 +18,8 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
 \r
 package com.owncloud.android.authentication;\r
 \r

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

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

-import android.accounts.AccountAuthenticatorActivity;\r

 import android.accounts.AccountManager;\r
 import android.accounts.AccountManager;\r

-import android.annotation.SuppressLint;\r

 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


@@ -59,17 +43,28 @@ 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.CookieManager;\r
-import android.webkit.WebSettings;\r
-import android.webkit.WebView;\r
+import android.widget.Button;\r

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

-import android.widget.Button;\r

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

-import android.widget.Toast;\r

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

+import android.widget.Toast;\r

 \r
 \r

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

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

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

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


@@ -80,7 +75,7 @@ import eu.alefzero.webdav.WebdavClient;
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r

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

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


@@ -116,6 +111,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     public static final byte ACTION_CREATE = 0;\r
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r
     public static final byte ACTION_CREATE = 0;\r
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r

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

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


@@ -152,8 +149,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     private TextView mOAuthTokenEndpointText;\r
     \r
     private TextView mAccountNameInput;\r
     private TextView mOAuthTokenEndpointText;\r
     \r
     private TextView mAccountNameInput;\r

-    private WebView mSsoWebView;\r
-    private SsoWebViewClient mWebViewClient;\r
+    private SamlWebViewDialog mSamlDialog;\r

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


@@ -180,7 +176,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mAccountNameInput = (EditText) findViewById(R.id.account_name);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mAccountNameInput = (EditText) findViewById(R.id.account_name);\r

-        mSsoWebView = (WebView) findViewById(R.id.web_sso_view);\r

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


@@ -231,7 +226,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
                 mHostUrlInput.setText(mHostBaseUrl);\r
             }\r
             initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
                 mHostUrlInput.setText(mHostBaseUrl);\r
             }\r
             initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r

-            mOAuth2Check.setChecked(mCurrentAuthTokenType == AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN);\r

             mJustCreated = true;\r
             \r
             if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r
             mJustCreated = true;\r
             \r
             if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r


@@ -263,6 +257,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mCurrentAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             if (mCurrentAuthTokenType == null) {\r
                 mCurrentAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
             mCurrentAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             if (mCurrentAuthTokenType == null) {\r
                 mCurrentAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r

+                \r

             }\r
 \r
             // check if server check was interrupted by a configuration change\r
             }\r
 \r
             // check if server check was interrupted by a configuration change\r


@@ -293,7 +288,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\r
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
 \r
         if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\r
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
 \r

-        if (mCurrentAuthTokenType == AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE || \r
+        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType) || \r

                 !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r
                 !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r


@@ -333,21 +328,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         \r
     }\r
     \r
         \r
     }\r
     \r

-    @SuppressLint("SetJavaScriptEnabled")\r
-       private void initWebView() {\r
-        CookieManager cookieManager = CookieManager.getInstance();\r
-        cookieManager.setAcceptCookie(true);\r
-        //cookieManager.removeSessionCookie();        \r
-\r
-        mWebViewClient = new SsoWebViewClient(mHandler, this);\r
-        mSsoWebView.setWebViewClient(mWebViewClient);\r
-        WebSettings webSettings = mSsoWebView.getSettings();\r
-        webSettings.setJavaScriptEnabled(true);\r
-        webSettings.setBuiltInZoomControls(true);\r
-        webSettings.setLoadWithOverviewMode(false);\r
-        webSettings.setSavePassword(false);\r
-        webSettings.setUserAgentString(WebdavClient.USER_AGENT);\r
-    }\r
+   \r

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


@@ -382,6 +363,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
             mUsernameInput.setText(userName);\r
         }\r
             String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
             mUsernameInput.setText(userName);\r
         }\r

+        \r
+        mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType));\r
+        \r

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


@@ -421,6 +405,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         \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
 \r
 \r
     }\r
 \r


@@ -461,6 +446,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         }\r
 \r
         mJustCreated = false;\r
         }\r
 \r
         mJustCreated = false;\r

+        \r

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


@@ -757,11 +743,14 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         } catch (IllegalArgumentException e) {\r
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
         }\r
         } catch (IllegalArgumentException e) {\r
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
         }\r

-\r
+        \r

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

-            mWebViewClient.setTargetUrl(mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType));\r
-            mSsoWebView.loadUrl(url);\r
+            String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
+            \r
+            // Show dialog\r
+            mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
+            mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);\r

             \r
             mAuthStatusIcon = android.R.drawable.ic_secure;\r
             mAuthStatusText = R.string.auth_follow_auth_server;\r
             \r
             mAuthStatusIcon = android.R.drawable.ic_secure;\r
             mAuthStatusText = R.string.auth_follow_auth_server;\r


@@ -1408,7 +1397,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             mAccountNameInput.setVisibility(View.GONE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             mAccountNameInput.setVisibility(View.GONE);\r

-            mSsoWebView.setVisibility(View.GONE);\r

             \r
         } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
             // SAML-based web Single Sign On\r
             \r
         } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
             // SAML-based web Single Sign On\r


@@ -1417,9 +1405,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             mAccountNameInput.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             mAccountNameInput.setVisibility(View.VISIBLE);\r

-            mSsoWebView.setVisibility(View.VISIBLE);\r
-            initWebView();\r
-            \r

         } else {\r
             // basic HTTP authorization\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r
         } else {\r
             // basic HTTP authorization\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r


@@ -1427,7 +1412,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mUsernameInput.setVisibility(View.VISIBLE);\r
             mPasswordInput.setVisibility(View.VISIBLE);\r
             mAccountNameInput.setVisibility(View.GONE);\r
             mUsernameInput.setVisibility(View.VISIBLE);\r
             mPasswordInput.setVisibility(View.VISIBLE);\r
             mAccountNameInput.setVisibility(View.GONE);\r

-            mSsoWebView.setVisibility(View.GONE);\r

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


@@ -1498,20 +1482,33 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     }\r
 \r
 \r
     }\r
 \r
 \r

+    public void onSamlDialogSuccess(String sessionCookie){\r
+        mAuthToken = sessionCookie;\r
+        \r
+        if (sessionCookie != null && sessionCookie.length() > 0) {\r
+          Log_OC.d(TAG, "Successful SSO - time to save the account");\r
+          mAuthToken = sessionCookie;\r
+          if (mAction == ACTION_CREATE) {\r
+              createAccount();\r
+\r
+          } else {\r
+              updateToken();\r
+          }\r
+\r
+          finish();\r
+\r
+      }\r
+    }\r
+\r
+\r
+\r

     @Override\r
     public void onSsoFinished(String sessionCookie) {\r
         //Toast.makeText(this, "got cookies: " + sessionCookie, Toast.LENGTH_LONG).show();\r
     @Override\r
     public void onSsoFinished(String sessionCookie) {\r
         //Toast.makeText(this, "got cookies: " + sessionCookie, Toast.LENGTH_LONG).show();\r

-        \r
+\r

         if (sessionCookie != null && sessionCookie.length() > 0) {\r
             Log_OC.d(TAG, "Successful SSO - time to save the account");\r
         if (sessionCookie != null && sessionCookie.length() > 0) {\r
             Log_OC.d(TAG, "Successful SSO - time to save the account");\r

-            mAuthToken = sessionCookie;\r
-            if (mAction == ACTION_CREATE) {\r
-                createAccount();\r
-\r
-            } else {\r
-                updateToken();\r
-            }\r
-\r
+            onSamlDialogSuccess(sessionCookie);\r

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


@@ -1519,5 +1516,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             Log_OC.d(TAG, "SSO failed");\r
         }\r
     }\r
             Log_OC.d(TAG, "SSO failed");\r
         }\r
     }\r

+    \r
+    \r

 \r
 }\r
 \r
 }\r