From a3683116ae04f639ff39484b1c54788bbce9fd30 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 1 Apr 2014 11:40:08 +0200 Subject: [PATCH 1/2] GetRemoteStatusOperation saves server version in result instance, instead of in a field --- .../status/GetRemoteStatusOperation.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index bc8b92e1..e52d666a 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; @@ -61,18 +63,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; @@ -87,8 +83,8 @@ public class GetRemoteStatusOperation extends RemoteOperation { } else { String version = json.getString(NODE_VERSION); String versionString = json.getString(NODE_VERSIONSTRING); - mOCVersion = new OwnCloudVersion(version, versionString); - if (!mOCVersion.isVersionValid()) { + OwnCloudVersion ocVersion = new OwnCloudVersion(version, versionString); + if (!ocVersion.isVersionValid()) { mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION); } else { @@ -97,6 +93,9 @@ public class GetRemoteStatusOperation extends RemoteOperation { RemoteOperationResult.ResultCode.OK_NO_SSL ); + ArrayList data = new ArrayList(); + data.add(ocVersion); + mLatestResult.setData(data); retval = true; } } From d066e9da51a04837504f9be3e266bdc82caabc64 Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 2 Apr 2014 09:45:50 +0200 Subject: [PATCH 2/2] GetRemoteUserNameOperation returns username in result.data --- .../lib/resources/users/GetRemoteUserNameOperation.java | 6 ++++++ 1 file changed, 6 insertions(+) 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);