diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index 052c7aae..9a675587 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java +++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java @@ -24,6 +24,8 @@ package com.owncloud.android.lib.resources.status; +import java.util.ArrayList; + import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONException; @@ -60,18 +62,12 @@ public class GetRemoteStatusOperation extends RemoteOperation { private String mUrl; private RemoteOperationResult mLatestResult; private Context mContext; - private OwnCloudVersion mOCVersion; public GetRemoteStatusOperation(String url, Context context) { mUrl = url; mContext = context; - mOCVersion = null; } - public OwnCloudVersion getDiscoveredVersion() { - return mOCVersion; - } - private boolean tryConnection(OwnCloudClient wc, String urlSt) { boolean retval = false; GetMethod get = null; @@ -85,8 +81,8 @@ public class GetRemoteStatusOperation extends RemoteOperation { mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED); } else { String version = json.getString(NODE_VERSION); - mOCVersion = new OwnCloudVersion(version); - if (!mOCVersion.isVersionValid()) { + OwnCloudVersion ocVersion = new OwnCloudVersion(version); + if (!ocVersion.isVersionValid()) { mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION); } else { @@ -95,6 +91,9 @@ public class GetRemoteStatusOperation extends RemoteOperation { RemoteOperationResult.ResultCode.OK_NO_SSL ); + ArrayList data = new ArrayList(); + data.add(ocVersion); + mLatestResult.setData(data); retval = true; } } diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java index 72d53efb..050b36d2 100644 --- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java +++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java @@ -24,6 +24,8 @@ package com.owncloud.android.lib.resources.users; +import java.util.ArrayList; + import org.apache.commons.httpclient.methods.GetMethod; import org.apache.http.HttpStatus; import org.json.JSONObject; @@ -93,6 +95,10 @@ public class GetRemoteUserNameOperation extends RemoteOperation { // Result result = new RemoteOperationResult(true, status, get.getResponseHeaders()); + // Username in result.data + ArrayList data = new ArrayList(); + data.add(displayName); + result.setData(data); mUserName = displayName; Log.d(TAG, "*** Parsed user information: " + id + " - " + displayName + " - " + email);