Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index a21205a,d844011..e9da35a
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -18,24 -18,8 +18,8 @@@
  \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.AccountAuthenticatorActivity;\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
@@@ -59,17 -43,28 +43,28 @@@ import android.view.View.OnFocusChangeL
  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.Button;\r
  import android.widget.TextView;\r
- import android.widget.Toast;\r
  import android.widget.TextView.OnEditorActionListener;\r
+ import android.widget.Toast;\r
  \r
+ import com.owncloud.android.Log_OC;\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
@@@ -80,7 -75,7 +75,7 @@@
   * @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
@@@ -116,6 -111,8 +111,8 @@@
      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
@@@ -152,8 -149,7 +149,7 @@@
      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
@@@ -180,7 -176,6 +176,6 @@@
          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
@@@ -229,9 -224,6 +224,9 @@@
                  }\r
                  mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL));\r
                  mHostUrlInput.setText(mHostBaseUrl);\r
 +                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
 +                mUsernameInput.setText(userName);\r
 +                mAccountNameInput.setText(userName);\r
              }\r
              initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
              mJustCreated = true;\r
@@@ -266,8 -258,6 +261,6 @@@
              if (mCurrentAuthTokenType == null) {\r
                  mCurrentAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
                  \r
-             } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
-                 restoreWebView(savedInstanceState);\r
              }\r
  \r
              // check if server check was interrupted by a configuration change\r
@@@ -292,8 -282,6 +285,8 @@@
              mUsernameInput.setEnabled(false);\r
              mUsernameInput.setFocusable(false);\r
              mOAuth2Check.setVisibility(View.GONE);\r
 +            mAccountNameInput.setEnabled(false);\r
 +            mAccountNameInput.setFocusable(false);\r
          }\r
          \r
          //if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton();\r
@@@ -340,40 -328,7 +333,7 @@@
          \r
      }\r
      \r
-     @SuppressLint("SetJavaScriptEnabled")\r
-       private void initWebView() {\r
-         CookieManager cookieManager = CookieManager.getInstance();\r
-         cookieManager.setAcceptCookie(true);\r
-         cookieManager.removeAllCookie();\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
-     @SuppressLint("SetJavaScriptEnabled")\r
-     private void restoreWebView(Bundle savedInstanceState) {\r
-         mSsoWebView.restoreState(savedInstanceState);\r
-         \r
-         CookieManager cookieManager = CookieManager.getInstance();\r
-         Log_OC.e(TAG, "Accept Cookie: " + cookieManager.acceptCookie());\r
- \r
-         mWebViewClient = new SsoWebViewClient(mHandler, this);\r
-         mSsoWebView.setWebViewClient(mWebViewClient);\r
-         mWebViewClient.setTargetUrl(mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType));\r
-         \r
-         WebSettings webSettings = mSsoWebView.getSettings();\r
-         webSettings.setJavaScriptEnabled(true);     // at least this one is not being kept by WebView#restoreState\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
@@@ -409,9 -364,6 +369,6 @@@
              mUsernameInput.setText(userName);\r
          }\r
          \r
-         if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
-             initWebView();\r
-         }\r
          mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType));\r
          \r
      }\r
@@@ -450,12 -402,10 +407,10 @@@
              outState.putParcelable(KEY_ACCOUNT, mAccount);\r
          }\r
          outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mCurrentAuthTokenType);\r
-         if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
-             mSsoWebView.saveState(outState);\r
-         }\r
          \r
          // refresh button enabled\r
          outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r
+         \r
  \r
      }\r
  \r
@@@ -485,15 -435,10 +440,15 @@@
      protected void onResume() {\r
          super.onResume();\r
          if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {\r
 -            if (mOAuth2Check.isChecked())\r
 +            if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) {\r
                  Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
 -            else\r
 +                \r
 +            } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
 +                Toast.makeText(this, R.string.auth_expired_saml_sso_token_toast, Toast.LENGTH_LONG).show();\r
 +                \r
 +            } else {\r
                  Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
 +            }\r
          }\r
  \r
          if (mNewCapturedUriFromOAuth2Redirection != null) {\r
@@@ -501,6 -446,7 +456,7 @@@
          }\r
  \r
          mJustCreated = false;\r
+         \r
      }\r
  \r
  \r
@@@ -797,11 -743,14 +753,14 @@@
          } 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
-             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
@@@ -1448,7 -1397,6 +1407,6 @@@
              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
@@@ -1457,8 -1405,6 +1415,6 @@@
              mUsernameInput.setVisibility(View.GONE);\r
              mPasswordInput.setVisibility(View.GONE);\r
              mAccountNameInput.setVisibility(View.VISIBLE);\r
-             mSsoWebView.setVisibility(View.VISIBLE);\r
-             \r
          } else {\r
              // basic HTTP authorization\r
              mOAuthAuthEndpointText.setVisibility(View.GONE);\r
@@@ -1466,7 -1412,6 +1422,6 @@@
              mUsernameInput.setVisibility(View.VISIBLE);\r
              mPasswordInput.setVisibility(View.VISIBLE);\r
              mAccountNameInput.setVisibility(View.GONE);\r
-             mSsoWebView.setVisibility(View.GONE);\r
          }\r
      }\r
      \r
@@@ -1537,20 -1482,33 +1492,33 @@@
      }\r
  \r
  \r
+     public void onSamlDialogSuccess(String sessionCookie){\r
+         mAuthToken = sessionCookie;\r
+         \r
+         if (sessionCookie != null && sessionCookie.length() > 0) {\r
+           Log_OC.d(TAG, "Successful SSO - time to save the account");\r
+           mAuthToken = sessionCookie;\r
+           if (mAction == ACTION_CREATE) {\r
+               createAccount();\r
+ \r
+           } else {\r
+               updateToken();\r
+           }\r
+ \r
+           finish();\r
+ \r
+       }\r
+     }\r
+ \r
+ \r
+ \r
      @Override\r
      public void onSsoFinished(String sessionCookie) {\r
          //Toast.makeText(this, "got cookies: " + sessionCookie, Toast.LENGTH_LONG).show();\r
-         \r
+ \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
@@@ -1558,5 -1516,7 +1526,7 @@@
              Log_OC.d(TAG, "SSO failed");\r
          }\r
      }\r
+     \r
+     \r
  \r
  }\r