Merge branch 'master' into release-1.7.0

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index df4e21b,7672284..8d7182d
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -683,7 -683,7 +683,7 @@@ SsoWebViewClientListener, OnSslUntruste
          \r
          if (mOperationsServiceBinder != null) {\r
              //Log_OC.wtf(TAG, "getting access token..." );\r
 -            mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
 +            mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);\r
          }\r
      }\r
  \r
@@@ -752,7 -752,7 +752,7 @@@
                  normalizeUrlSuffix(uri)\r
              );\r
              if (mOperationsServiceBinder != null) {\r
 -                mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
 +                mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);\r
              } else {\r
                Log_OC.wtf(TAG, "Server check tried with OperationService unbound!" );\r
              }\r
@@@ -888,7 -888,7 +888,7 @@@
          \r
          if (mOperationsServiceBinder != null) {\r
              //Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." );\r
 -            mWaitingForOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent);\r
 +            mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(existenceCheckIntent);\r
          }\r
      }\r
  \r
@@@ -1020,12 -1020,11 +1020,11 @@@
          dismissDialog(WAIT_DIALOG_TAG);\r
  
          if (result.isIdPRedirection()) {
-             String url = result.getRedirectedLocation();\r
              String targetUrl = mServerInfo.mBaseUrl \r
                      + AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r
  \r
              // Show dialog\r
-             SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
+             SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(targetUrl, targetUrl);            \r
              dialog.show(getSupportFragmentManager(), SAML_DIALOG_TAG);\r
  \r
              mAuthStatusIcon = 0;\r
@@@ -1704,7 -1703,7 +1703,7 @@@
          \r
          if (mOperationsServiceBinder != null) {\r
              //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
 -            mWaitingForOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r
 +            mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getUserNameIntent);\r
          }\r
      }\r
  \r