Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...

Conflicts:
	src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e69ff8e,4fd50c7..9ba0970
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -1605,27 -1566,8 +1608,27 @@@ implements  OnRemoteOperationListener, 
              // TODO - show fail\r
              Log_OC.d(TAG, "SSO failed");\r
          }\r
-     }\r
      \r
+     }\r
      \r
 +    /** Show auth_message \r
 +     * \r
 +     * @param message\r
 +     */\r
 +    private void showAuthMessage(String message) {\r
 +       mAuthMessage.setVisibility(View.VISIBLE);\r
 +       mAuthMessage.setText(message);\r
 +    }\r
 +    \r
 +    private void hideAuthMessage() {\r
 +        mAuthMessage.setVisibility(View.GONE);\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