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

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 4aa0528,4fd50c7..88738bb
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -144,7 -144,7 +144,7 @@@ implements  OnRemoteOperationListener, 
      private boolean mHostUrlInputEnabled;\r
      private View mRefreshButton;\r
  \r
 -    private String mCurrentAuthTokenType;\r
 +    private String mAuthTokenType;\r
      \r
      private EditText mUsernameInput;\r
      private EditText mPasswordInput;\r
@@@ -258,9 -258,9 +258,9 @@@
  \r
              // account data, if updating\r
              mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
 -            mCurrentAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
 -            if (mCurrentAuthTokenType == null) {\r
 -                mCurrentAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
 +            mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
 +            if (mAuthTokenType == null) {\r
 +                mAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
                  \r
              }\r
  \r
@@@ -292,7 -292,7 +292,7 @@@
          if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\r
          mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
  \r
 -        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType) || \r
 +        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) || \r
                  !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
              mOAuth2Check.setVisibility(View.GONE);\r
          }\r
@@@ -332,18 -332,6 +332,18 @@@
              }\r
          });\r
          \r
 +        findViewById(R.id.scroll).setOnTouchListener(new OnTouchListener() {\r
 +            @Override\r
 +            public boolean onTouch(View view, MotionEvent event) {\r
 +                if (event.getAction() == MotionEvent.ACTION_DOWN) {\r
 +                    if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&\r
 +                            mHostUrlInput.hasFocus()) {\r
 +                        checkOcServer();\r
 +                    }\r
 +                }\r
 +                return false;\r
 +            }\r
 +        });\r
      }\r
      \r
     \r
@@@ -352,12 -340,12 +352,12 @@@
          boolean oAuthRequired = false;\r
          boolean samlWebSsoRequired = false;\r
  \r
 -        mCurrentAuthTokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
 +        mAuthTokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
          mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
          \r
          // TODO could be a good moment to validate the received token type, if not null\r
          \r
 -        if (mCurrentAuthTokenType == 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, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r
@@@ -369,11 -357,11 +369,11 @@@
                  samlWebSsoRequired = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));            \r
              }\r
              if (oAuthRequired) {\r
 -                mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
 +                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
              } else if (samlWebSsoRequired) {\r
 -                mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;\r
 +                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;\r
              } else {\r
 -                mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
 +                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
              }\r
          }\r
      \r
@@@ -382,7 -370,7 +382,7 @@@
              mUsernameInput.setText(userName);\r
          }\r
          \r
 -        mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType));\r
 +        mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType));\r
          \r
      }\r
  \r
@@@ -419,7 -407,7 +419,7 @@@
          if (mAccount != null) {\r
              outState.putParcelable(KEY_ACCOUNT, mAccount);\r
          }\r
 -        outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mCurrentAuthTokenType);\r
 +        outState.putString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE, mAuthTokenType);\r
          \r
          // refresh button enabled\r
          outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r
@@@ -650,9 -638,9 +650,9 @@@
              return;\r
          }\r
  \r
 -        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) {\r
 +        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {\r
              startOauthorization();\r
 -        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) { \r
 +        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) { \r
              startSamlBasedFederatedSingleSignOnAuthorization();\r
          } else {\r
              checkBasicAuthorization();\r
@@@ -666,7 -654,7 +666,7 @@@
       */\r
      private void checkBasicAuthorization() {\r
          /// get the path to the root folder through WebDAV from the version server\r
 -        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
 +        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
  \r
          /// get basic credentials entered by user\r
          String username = mUsernameInput.getText().toString();\r
@@@ -722,12 -710,13 +722,13 @@@
          showDialog(DIALOG_LOGIN_PROGRESS);\r
          \r
          /// get the path to the root folder through WebDAV from the version server\r
 -        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
 +        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
  \r
          /// test credentials accessing the root folder\r
          mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
          WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);\r
          mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
+       \r
      }\r
  \r
      /**\r
@@@ -745,7 -734,7 +746,7 @@@
              onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r
  \r
          } else if (operation instanceof ExistenceCheckOperation)  {\r
 -            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
 +            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
                  onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);\r
                  \r
              } else {\r
@@@ -764,14 -753,14 +765,14 @@@
          \r
          if (result.isTemporalRedirection() || result.isIdPRedirection()) {\r
              String url = result.getRedirectedLocation();\r
 -            String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
 +            String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\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
+             mAuthStatusIcon = 0;\r
+             mAuthStatusText = 0;\r
              \r
          } else {\r
              mAuthStatusIcon = R.drawable.common_error;\r
@@@ -844,6 -833,7 +845,6 @@@
              }\r
  \r
          }\r
 -        Log_OC.d(TAG, "URL Normalize " + url);\r
          return (url != null ? url : "");\r
      }\r
  \r
@@@ -1031,7 -1021,7 +1032,7 @@@
              // 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
 -        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
 +        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
          if (result.isSuccess() && webdav_path != null) {\r
              /// be gentle with the user\r
              showDialog(DIALOG_LOGIN_PROGRESS);\r
@@@ -1113,6 -1103,7 +1114,7 @@@
              showAuthStatus();\r
              Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
          }\r
+ \r
      }\r
  \r
  \r
@@@ -1125,15 -1116,15 +1127,15 @@@
          response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
          response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
          \r
 -        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) { \r
 +        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.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, mCurrentAuthTokenType, mAuthToken);\r
 +            mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
              \r
 -        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
 +        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.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, mCurrentAuthTokenType, mAuthToken);\r
 +            mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
              \r
          } else {\r
              response.putString(AccountManager.KEY_AUTHTOKEN, mPasswordInput.getText().toString());\r
@@@ -1152,8 -1143,8 +1154,8 @@@
       */\r
      private boolean createAccount() {\r
          /// create and save new ownCloud account\r
 -        boolean isOAuth = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType);\r
 -        boolean isSaml =  AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType);\r
 +        boolean isOAuth = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType);\r
 +        boolean isSaml =  AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType);\r
  \r
          Uri uri = Uri.parse(mHostBaseUrl);\r
          String username = mUsernameInput.getText().toString().trim();\r
@@@ -1203,7 -1194,7 +1205,7 @@@
                  intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); */\r
              intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
              if (isOAuth || isSaml) {\r
 -                mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r
 +                mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
              }\r
              /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
              mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());\r
@@@ -1427,9 -1418,9 +1429,9 @@@
      public void onCheckClick(View view) {\r
          CheckBox oAuth2Check = (CheckBox)view;\r
          if (oAuth2Check.isChecked()) {\r
 -            mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
 +            mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
          } else {\r
 -            mCurrentAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
 +            mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
          }\r
          adaptViewAccordingToAuthenticationMethod();\r
      }\r
@@@ -1440,14 -1431,14 +1442,14 @@@
       * the current authorization method.\r
       */\r
      private void adaptViewAccordingToAuthenticationMethod () {\r
 -        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mCurrentAuthTokenType)) {\r
 +        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {\r
              // OAuth 2 authorization\r
              mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
              mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
              mUsernameInput.setVisibility(View.GONE);\r
              mPasswordInput.setVisibility(View.GONE);\r
              \r
 -        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
 +        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
              // SAML-based web Single Sign On\r
              mOAuthAuthEndpointText.setVisibility(View.GONE);\r
              mOAuthTokenEndpointText.setVisibility(View.GONE);\r
@@@ -1493,7 -1484,7 +1495,7 @@@
              }\r
              \r
          } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null && inputField.equals(mHostUrlInput)) {\r
 -            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
 +            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
                  checkOcServer();\r
              }\r
          }\r
@@@ -1538,6 -1529,7 +1540,6 @@@
          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
              boolean success = true;\r
              if (mAction == ACTION_CREATE) {\r
@@@ -1550,6 -1542,7 +1552,7 @@@
                  finish();\r
              }\r
          }\r
+ \r
              \r
      }\r
  \r
@@@ -1573,23 -1566,8 +1576,23 @@@
              // TODO - show fail\r
              Log_OC.d(TAG, "SSO failed");\r
          }\r
-     }\r
      \r
+     }\r
      \r
  \r
 +    private void syncAccount(){\r
 +        /// immediately request for the synchronization of the new account\r
 +        Bundle bundle = new Bundle();\r
 +        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
 +        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);\r
 +    }\r
 +    \r
 +    @Override\r
 +    public boolean onTouchEvent(MotionEvent event) {\r
 +        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&\r
 +                mHostUrlInput.hasFocus() && event.getAction() == MotionEvent.ACTION_DOWN) {\r
 +            checkOcServer();\r
 +        }\r
 +        return super.onTouchEvent(event);\r
 +    }\r
  }\r