Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...

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