From f63da07a3e3c25c94345ca0761ca0bbf50ea9090 Mon Sep 17 00:00:00 2001 From: masensio Date: Thu, 20 Mar 2014 16:50:35 +0100 Subject: [PATCH 1/4] Changes from comments in PR#443 --- .../operations/RemoteOperationResult.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index cbc8bb1b..1f923d1f 100644 --- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -59,10 +59,10 @@ import android.util.Log; */ public class RemoteOperationResult implements Serializable { - /** Generated - should be refreshed every time the class changes!! */ - private static final long serialVersionUID = -8257349554488668693L; - - private static final String TAG = "RemoteOperationResult"; + /** Generated - should be refreshed every time the class changes!! */; + private static final long serialVersionUID = 6160608497101537164L; + + private static final String TAG = "RemoteOperationResult"; public enum ResultCode { OK, @@ -105,6 +105,7 @@ public class RemoteOperationResult implements Serializable { private Exception mException = null; private ResultCode mCode = ResultCode.UNKNOWN_ERROR; private String mRedirectedLocation; + private String mAuthenticate; private ArrayList mData; @@ -155,6 +156,10 @@ public class RemoteOperationResult implements Serializable { mRedirectedLocation = current.getValue(); break; } + if ("WWW-Authenticate".equals(current.getName())) { + mAuthenticate = current.getValue(); + break; + } } } } @@ -359,5 +364,10 @@ public class RemoteOperationResult implements Serializable { (mRedirectedLocation.toUpperCase().contains("SAML") || mRedirectedLocation.toLowerCase().contains("wayf"))); } + + public boolean isBasicAuthentication() { + return (mAuthenticate != null && + (mAuthenticate.toUpperCase().startsWith("BASIC"))); + } } From 4572ca29e82cad9fc521179bde26715aa46a324c Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 21 Mar 2014 13:41:19 +0100 Subject: [PATCH 2/4] Replace method infering basic authorization for other returning the 'authenticate' header value; let's analyze the header in other class --- .../lib/common/operations/RemoteOperationResult.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index 1f923d1f..8f57165e 100644 --- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -108,7 +108,7 @@ public class RemoteOperationResult implements Serializable { private String mAuthenticate; private ArrayList mData; - + public RemoteOperationResult(ResultCode code) { mCode = code; mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL); @@ -365,9 +365,8 @@ public class RemoteOperationResult implements Serializable { mRedirectedLocation.toLowerCase().contains("wayf"))); } - public boolean isBasicAuthentication() { - return (mAuthenticate != null && - (mAuthenticate.toUpperCase().startsWith("BASIC"))); + public String getAuthenticateHeader() { + return mAuthenticate; } } From cfe6270c11708d36b2ebdbb438c7a0dc4aae4857 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 24 Mar 2014 10:08:56 +0100 Subject: [PATCH 3/4] Updated serial number for serialization of RemoteOperationResult --- .../android/lib/common/operations/RemoteOperationResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index 8f57165e..3855a189 100644 --- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -60,7 +60,7 @@ import android.util.Log; public class RemoteOperationResult implements Serializable { /** Generated - should be refreshed every time the class changes!! */; - private static final long serialVersionUID = 6160608497101537164L; + private static final long serialVersionUID = -9003837206000993465L; private static final String TAG = "RemoteOperationResult"; From 3fed795a337c246fd6e0c824ccbdaaa5636cf660 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 24 Mar 2014 10:09:13 +0100 Subject: [PATCH 4/4] Warnings removed --- .../owncloud/android/lib/resources/shares/ShareXMLParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java index 671bfd49..48a8358e 100644 --- a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java +++ b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java @@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; -import android.util.Log; +//import android.util.Log; import android.util.Xml; import com.owncloud.android.lib.common.network.WebdavUtils; @@ -46,7 +46,7 @@ import com.owncloud.android.lib.resources.files.FileUtils; public class ShareXMLParser { - private static final String TAG = ShareXMLParser.class.getSimpleName(); + //private static final String TAG = ShareXMLParser.class.getSimpleName(); // No namespaces private static final String ns = null;