From 492b76230b0794ae5b0f48218f10d0f1c81f6a58 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Tue, 28 Jan 2014 13:07:29 +0100
Subject: [PATCH] OC-2746: RemoteOperationResult return ArrayList<Object>
 instead of ArrayList<RemoteFile>

---
 .../lib/operations/common/RemoteOperationResult.java      | 6 +++---
 .../lib/operations/remote/GetRemoteSharesOperation.java   | 8 +++++---
 .../lib/operations/remote/ReadRemoteFileOperation.java    | 2 +-
 .../lib/operations/remote/ReadRemoteFolderOperation.java  | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java b/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java
index df6d7471..21e714c1 100644
--- a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java
@@ -106,7 +106,7 @@ public class RemoteOperationResult implements Serializable {
     private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
     private String mRedirectedLocation;
 
-    private ArrayList<RemoteFile> mFiles;
+    private ArrayList<Object> mFiles;
     
     public RemoteOperationResult(ResultCode code) {
         mCode = code;
@@ -207,11 +207,11 @@ public class RemoteOperationResult implements Serializable {
     }
 
 
-    public void setData(ArrayList<RemoteFile> files){
+    public void setData(ArrayList<Object> files){
     	mFiles = files;
     }
     
-	public ArrayList<RemoteFile> getData(){
+	public ArrayList<Object> getData(){
 		return mFiles;
 	}
     
diff --git a/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java
index b3935ed2..da54fadb 100644
--- a/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java
@@ -62,9 +62,6 @@ public class GetRemoteSharesOperation extends RemoteOperation {
 
 	private String mUrlServer;
 
-	public ArrayList<OCShare> getShares() {
-		return mShares;
-	}
 	
 	public GetRemoteSharesOperation(String urlServer) {
 		mUrlServer = urlServer;
@@ -95,6 +92,11 @@ public class GetRemoteSharesOperation extends RemoteOperation {
 				if (mShares != null) {
 					Log.d(TAG, "Shares: " + mShares.size());
 					result = new RemoteOperationResult(ResultCode.OK);
+					ArrayList<Object> sharesObjects = new ArrayList<Object>();
+					for (OCShare share: mShares) {
+						sharesObjects.add(share);
+					}
+					result.setData(sharesObjects);
 				}
 			}
 		} catch (HttpException e) {
diff --git a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java
index 0410cd62..e0017dc6 100644
--- a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java
@@ -89,7 +89,7 @@ public class ReadRemoteFileOperation extends RemoteOperation {
     			MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
 				WebdavEntry we = new WebdavEntry(resp.getResponses()[0], client.getBaseUri().getPath());
 				RemoteFile remoteFile = new RemoteFile(we);
-				ArrayList<RemoteFile> files = new ArrayList<RemoteFile>();
+				ArrayList<Object> files = new ArrayList<Object>();
 				files.add(remoteFile);
 
     			// Result of the operation
diff --git a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java
index 521d73e7..cb9551ad 100644
--- a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java
@@ -52,7 +52,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
 	private static final String TAG = ReadRemoteFolderOperation.class.getSimpleName();
 
 	private String mRemotePath;
-	private ArrayList<RemoteFile> mFolderAndFiles;
+	private ArrayList<Object> mFolderAndFiles;
 	
 	/**
      * Constructor
@@ -134,7 +134,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
      *  @return                
      */
     private void readData(MultiStatus dataInServer, OwnCloudClient client) {   	
-        mFolderAndFiles = new ArrayList<RemoteFile>();
+        mFolderAndFiles = new ArrayList<Object>();
         
         // parse data from remote folder 
         WebdavEntry we = new WebdavEntry(dataInServer.getResponses()[0], client.getBaseUri().getPath());