From: David A. Velasco Date: Tue, 3 Feb 2015 11:46:23 +0000 (+0100) Subject: Merge branch 'master' into release-1.7.0 X-Git-Tag: oc-android-1.7.0_signed~15 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5116bd99e26954fb83621863ff26e351d0a08cfd?ds=sidebyside;hp=-c Merge branch 'master' into release-1.7.0 --- 5116bd99e26954fb83621863ff26e351d0a08cfd diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java index df4e21b1,7672284b..8d7182d7 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@@ -683,7 -683,7 +683,7 @@@ SsoWebViewClientListener, OnSslUntruste if (mOperationsServiceBinder != null) { //Log_OC.wtf(TAG, "getting access token..." ); - mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent); + mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent); } } @@@ -752,7 -752,7 +752,7 @@@ normalizeUrlSuffix(uri) ); if (mOperationsServiceBinder != null) { - mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent); + mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent); } else { Log_OC.wtf(TAG, "Server check tried with OperationService unbound!" ); } @@@ -888,7 -888,7 +888,7 @@@ if (mOperationsServiceBinder != null) { //Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." ); - mWaitingForOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent); + mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(existenceCheckIntent); } } @@@ -1020,12 -1020,11 +1020,11 @@@ dismissDialog(WAIT_DIALOG_TAG); if (result.isIdPRedirection()) { - String url = result.getRedirectedLocation(); String targetUrl = mServerInfo.mBaseUrl + AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType); // Show dialog - SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(url, targetUrl); + SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(targetUrl, targetUrl); dialog.show(getSupportFragmentManager(), SAML_DIALOG_TAG); mAuthStatusIcon = 0; @@@ -1704,7 -1703,7 +1703,7 @@@ if (mOperationsServiceBinder != null) { //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." ); - mWaitingForOpId = mOperationsServiceBinder.newOperation(getUserNameIntent); + mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getUserNameIntent); } }