From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 23 Aug 2013 12:32:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b... 
X-Git-Tag: oc-android-1.4.6~18^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea5cd96679e66b81f9789b5667eecfc99846de1a?ds=inline

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

ea5cd96679e66b81f9789b5667eecfc99846de1a
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 4aa0528b,4fd50c7f..88738bbb
--- a/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
              Log_OC.d(TAG, "SSO failed");
          }
-     }
      
+     }
      
  
 +    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);
 +    }
 +    
 +    @Override
 +    public boolean onTouchEvent(MotionEvent event) {
 +        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&
 +                mHostUrlInput.hasFocus() && event.getAction() == MotionEvent.ACTION_DOWN) {
 +            checkOcServer();
 +        }
 +        return super.onTouchEvent(event);
 +    }
  }