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

diff --cc 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
@@@ -1573,23 -1566,8 +1576,23 @@@ implements  OnRemoteOperationListener, 
              // 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