1
0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-19 04:13:07 +00:00

Merge branch 'master' into develop

This commit is contained in:
masensio
2014-02-24 12:56:22 +01:00
5 changed files with 94 additions and 76 deletions
@@ -80,10 +80,10 @@ public class GetRemoteUserNameOperation extends RemoteOperation {
//Get the user
try {
//GetMethod get = new GetMethod(client.getWebdavUri() + OCS_ROUTE);
get = new GetMethod(client.getBaseUri() + OCS_ROUTE);
Log.e(TAG, "Getting OC user information from " + client.getBaseUri() + OCS_ROUTE);
Log.e(TAG, "Getting OC user information from " + client.getWebdavUri() + OCS_ROUTE);
get = new GetMethod(client.getWebdavUri() + OCS_ROUTE);
//get = new GetMethod(client.getBaseUri() + OCS_ROUTE); // need to fix the semantics of getBaseUri and getWebdavUri
//Log.e(TAG, "Getting OC user information from " + client.getBaseUri() + OCS_ROUTE);
//Log.e(TAG, "Getting OC user information from " + client.getWebdavUri() + OCS_ROUTE);
// Add the Header
get.addRequestHeader(HEADER_OCS_API, HEADER_OCS_API_VALUE);
status = client.executeMethod(get);