From bc8d0bd125fc0921dbec718a4170ba56cb9f242e Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 29 Jan 2014 10:17:51 +0100 Subject: [PATCH] OC-2746: Changes from comments in PR#1 in android-library repo --- .../lib/operations/common/RemoteOperationResult.java | 8 ++++---- .../lib/operations/remote/GetRemoteSharesOperation.java | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java b/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java index 21e714c1..ba5dd2c0 100644 --- a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java @@ -106,12 +106,12 @@ public class RemoteOperationResult implements Serializable { private ResultCode mCode = ResultCode.UNKNOWN_ERROR; private String mRedirectedLocation; - private ArrayList mFiles; + private ArrayList mData; public RemoteOperationResult(ResultCode code) { mCode = code; mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL); - mFiles = null; + mData = null; } private RemoteOperationResult(boolean success, int httpCode) { @@ -208,11 +208,11 @@ public class RemoteOperationResult implements Serializable { public void setData(ArrayList files){ - mFiles = files; + mData = files; } public ArrayList getData(){ - return mFiles; + return mData; } public boolean isSuccess() { diff --git a/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java index da54fadb..3149a045 100644 --- a/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java +++ b/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java @@ -60,11 +60,8 @@ public class GetRemoteSharesOperation extends RemoteOperation { private ArrayList mShares; // List of shares for result - private String mUrlServer; - - public GetRemoteSharesOperation(String urlServer) { - mUrlServer = urlServer; + public GetRemoteSharesOperation() { } @Override @@ -73,8 +70,8 @@ public class GetRemoteSharesOperation extends RemoteOperation { int status = -1; // Get Method - GetMethod get = new GetMethod(mUrlServer + SHAREAPI_ROUTE); - Log.d(TAG, "URL ------> " + mUrlServer + SHAREAPI_ROUTE); + GetMethod get = new GetMethod(client.getBaseUri() + SHAREAPI_ROUTE); + Log.d(TAG, "URL ------> " + client.getBaseUri() + SHAREAPI_ROUTE); // Get the response try{