flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-30 18:07:38 +00:00
Code Issues Releases Wiki Activity

OC-2746: RemoteOperationResult return ArrayList<Object> instead of ArrayList<RemoteFile>

Browse Source
This commit is contained in:
masensio 2014-01-28 13:07:29 +01:00
parent b1ae56cbea
commit 492b76230b
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java
View File

@ -106,7 +106,7 @@ public class RemoteOperationResult implements Serializable {
private ResultCode mCode = ResultCode.UNKNOWN_ERROR; private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
private String mRedirectedLocation; private String mRedirectedLocation;
private ArrayList<RemoteFile> mFiles; private ArrayList<Object> mFiles;
public RemoteOperationResult(ResultCode code) { public RemoteOperationResult(ResultCode code) {
mCode = 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; mFiles = files;
} }
public ArrayList<RemoteFile> getData(){ public ArrayList<Object> getData(){
return mFiles; return mFiles;
} }

8
src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java
View File

@ -62,9 +62,6 @@ public class GetRemoteSharesOperation extends RemoteOperation {
private String mUrlServer; private String mUrlServer;
public ArrayList<OCShare> getShares() {
return mShares;
}
public GetRemoteSharesOperation(String urlServer) { public GetRemoteSharesOperation(String urlServer) {
mUrlServer = urlServer; mUrlServer = urlServer;
@ -95,6 +92,11 @@ public class GetRemoteSharesOperation extends RemoteOperation {
if (mShares != null) { if (mShares != null) {
Log.d(TAG, "Shares: " + mShares.size()); Log.d(TAG, "Shares: " + mShares.size());
result = new RemoteOperationResult(ResultCode.OK); result = new RemoteOperationResult(ResultCode.OK);
ArrayList<Object> sharesObjects = new ArrayList<Object>();
for (OCShare share: mShares) {
sharesObjects.add(share);
}
result.setData(sharesObjects);
} }
} }
} catch (HttpException e) { } catch (HttpException e) {

2
src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java
View File

@ -89,7 +89,7 @@ public class ReadRemoteFileOperation extends RemoteOperation {
MultiStatus resp = propfind.getResponseBodyAsMultiStatus(); MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
WebdavEntry we = new WebdavEntry(resp.getResponses()[0], client.getBaseUri().getPath()); WebdavEntry we = new WebdavEntry(resp.getResponses()[0], client.getBaseUri().getPath());
RemoteFile remoteFile = new RemoteFile(we); RemoteFile remoteFile = new RemoteFile(we);
ArrayList<RemoteFile> files = new ArrayList<RemoteFile>(); ArrayList<Object> files = new ArrayList<Object>();
files.add(remoteFile); files.add(remoteFile);
// Result of the operation // Result of the operation

4
src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java
View File

@ -52,7 +52,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
private static final String TAG = ReadRemoteFolderOperation.class.getSimpleName(); private static final String TAG = ReadRemoteFolderOperation.class.getSimpleName();
private String mRemotePath; private String mRemotePath;
private ArrayList<RemoteFile> mFolderAndFiles; private ArrayList<Object> mFolderAndFiles;
/** /**
* Constructor * Constructor
@ -134,7 +134,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
* @return * @return
*/ */
private void readData(MultiStatus dataInServer, OwnCloudClient client) { private void readData(MultiStatus dataInServer, OwnCloudClient client) {
mFolderAndFiles = new ArrayList<RemoteFile>(); mFolderAndFiles = new ArrayList<Object>();
// parse data from remote folder // parse data from remote folder
WebdavEntry we = new WebdavEntry(dataInServer.getResponses()[0], client.getBaseUri().getPath()); WebdavEntry we = new WebdavEntry(dataInServer.getResponses()[0], client.getBaseUri().getPath());