From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 12 Aug 2013 11:21:01 +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~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/830bb7c85303e8725203d083940e4bfc568a405f?ds=inline

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
---

830bb7c85303e8725203d083940e4bfc568a405f
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 0f7328ae,0e8ba48c..a21205ae
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -229,12 -229,8 +229,11 @@@ implements  OnRemoteOperationListener, 
                  }
                  mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL));
                  mHostUrlInput.setText(mHostBaseUrl);
 +                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));
 +                mUsernameInput.setText(userName);
 +                mAccountNameInput.setText(userName);
              }
              initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod
-             mOAuth2Check.setChecked(mCurrentAuthTokenType == AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN);
              mJustCreated = true;
              
              if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {