X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7c4fc0486ffedcbbc35050d285570a4563befb2d..2628eceb6b7548d151ab61c42969b42064e586bd:/src/com/owncloud/android/authentication/AuthenticatorActivity.java diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 638b5dd8..074751e6 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -518,7 +518,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener { // refresh button enabled outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE)); - } @@ -539,6 +538,26 @@ SsoWebViewClientListener, OnSslUntrustedCertListener { } + @Override + protected void onStart() { + if (mOperationsServiceBinder != null) { + mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler); + } + + super.onStart(); + } + + + @Override + protected void onStop() { + if (mOperationsServiceBinder != null) { + mOperationsServiceBinder.removeOperationListener(this); + } + super.onStop(); + } + + + /** * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and * deferred in {@link #onNewIntent(Intent)}, is processed here. @@ -1014,11 +1033,14 @@ SsoWebViewClientListener, OnSslUntrustedCertListener { private void detectAuthorizationMethod() { Log_OC.d(TAG, "Trying empty authorization to detect authentication method"); - + + String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType); + /// test credentials - Intent service = new Intent(this, OperationsService.class); + Intent service = new Intent(this, OperationsService.class); service.setAction(OperationsService.ACTION_DETECT_AUTHENTICATION_METHOD); service.putExtra(OperationsService.EXTRA_SERVER_URL, mHostBaseUrl); + service.putExtra(OperationsService.EXTRA_WEBDAV_PATH, webdav_path); startService(service); }