From: masensio <masensio@solidgear.es>
Date: Tue, 27 Aug 2013 11:49:31 +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
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ce1e0c210a779550de9bc7a6dadb901033a99801

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
---

ce1e0c210a779550de9bc7a6dadb901033a99801
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 64855243,4ea7f3d0..e0d48a33
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -215,8 -214,8 +217,9 @@@ implements  OnRemoteOperationListener, 
          }
  
          if (savedInstanceState == null) {
+             mResumed = false;
              /// connection state and info
 +            mAuthMessageVisibility = View.GONE;
              mServerStatusText = mServerStatusIcon = 0;
              mServerIsValid = false;
              mServerIsChecked = false;
@@@ -243,9 -240,8 +246,10 @@@
              }
              
          } else {
+             mResumed = true;
              /// connection state and info
 +            mAuthMessageVisibility = savedInstanceState.getInt(KEY_AUTH_MESSAGE_VISIBILITY);
 +            mAuthMessageText = savedInstanceState.getString(KEY_AUTH_MESSAGE_TEXT);
              mServerIsValid = savedInstanceState.getBoolean(KEY_SERVER_VALID);
              mServerIsChecked = savedInstanceState.getBoolean(KEY_SERVER_CHECKED);
              mServerStatusText = savedInstanceState.getInt(KEY_SERVER_STATUS_TEXT);