mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add webdav url to DetectAuthenticationMethodOperation

Browse source
This commit is contained in:
masensio 2014-03-28 14:51:36 +01:00
parent 7c4fc0486f
commit 2812120456
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -518,7 +518,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
// refresh button enabled
outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));
}
@ -538,7 +537,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
}
}
/**
* 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 +1012,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);
}

6
src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java
View file

@ -64,14 +64,17 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation {
}
private Context mContext;
private String mWebDavUrl;
/**
* Constructor
*
* @param context Android context of the caller.
* @param webdavUrl
*/
public DetectAuthenticationMethodOperation(Context context) {
public DetectAuthenticationMethodOperation(Context context, String webdavUrl) {
mContext = context;
mWebDavUrl = webdavUrl;
}
@ -90,6 +93,7 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation {
AuthenticationMethod authMethod = AuthenticationMethod.UNKNOWN;
RemoteOperation operation = new ExistenceCheckRemoteOperation("", mContext, false);
client.setWebdavUri(Uri.parse(mWebDavUrl));
client.setBasicCredentials("", "");
client.setFollowRedirects(false);

4
src/com/owncloud/android/services/OperationsService.java
View file

@ -59,6 +59,7 @@ public class OperationsService extends Service {
public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
public static final String EXTRA_SEND_INTENT = "SEND_INTENT";
public static final String EXTRA_RESULT = "RESULT";
public static final String EXTRA_WEBDAV_PATH = "WEBDAV_PATH";
public static final String ACTION_CREATE_SHARE = "CREATE_SHARE";
public static final String ACTION_UNSHARE = "UNSHARE";
@ -136,7 +137,8 @@ public class OperationsService extends Service {
operation = new UnshareLinkOperation(remotePath, this.getApplicationContext());
}
} else if (action.equals(ACTION_DETECT_AUTHENTICATION_METHOD)) { // Detect Authentication Method
operation = new DetectAuthenticationMethodOperation(this.getApplicationContext());
String webdav_url = serverUrl + intent.getStringExtra(EXTRA_WEBDAV_PATH);
operation = new DetectAuthenticationMethodOperation(this.getApplicationContext(), webdav_url);
} else {
// nothing we are going to handle