From: masensio <masensio@solidgear.es>
Date: Fri, 23 Aug 2013 11:42:07 +0000 (+0200)
Subject: Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s... 
X-Git-Tag: oc-android-1.4.6~17^2~6^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/71347b48a089a677d7799628abf4056bbd780d71

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

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

71347b48a089a677d7799628abf4056bbd780d71
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e69ff8e3,4fd50c7f..9ba0970c
--- a/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
              Log_OC.d(TAG, "SSO failed");
          }
-     }
      
+     }
      
 +    /** Show auth_message 
 +     * 
 +     * @param message
 +     */
 +    private void showAuthMessage(String message) {
 +       mAuthMessage.setVisibility(View.VISIBLE);
 +       mAuthMessage.setText(message);
 +    }
 +    
 +    private void hideAuthMessage() {
 +        mAuthMessage.setVisibility(View.GONE);
 +    }
  
 +    
 +    private void syncAccount(){
 +        /// immediately request for the synchronization of the new account
 +        Bundle bundle = new Bundle();
 +        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
 +        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
 +    }
  }