From 626e2f0efa79abd714f7bf56f6cfe38c2fbb5c61 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 7 Feb 2017 08:53:14 +0100
Subject: [PATCH] Added changes requested in PR

---
 .../android/lib/common/operations/RemoteOperationResult.java   | 2 +-
 .../lib/resources/files/DownloadRemoteFileOperation.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index e4b2c67e..6c3cefd3 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -254,7 +254,7 @@ public class RemoteOperationResult implements Serializable {
                 ErrorMessageParser xmlParser = new ErrorMessageParser();
                 try {
                     String errorMessage = xmlParser.parseXMLResponse(is);
-                    if (errorMessage != "" && errorMessage != null) {
+                    if (errorMessage != null && errorMessage != "") {
                         mCode = ResultCode.SPECIFIC_FORBIDDEN;
                         mHttpPhrase = errorMessage;
                     }
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 5ba1b618..0a013bee 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -57,6 +57,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 public class DownloadRemoteFileOperation extends RemoteOperation {
 
     private static final String TAG = DownloadRemoteFileOperation.class.getSimpleName();
+    private static final int FORBIDDEN_ERROR = 403;
 
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
@@ -161,7 +162,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                     // TODO some kind of error control!
                 }
 
-            } else if (status != 403){
+            } else if (status != FORBIDDEN_ERROR){
                 client.exhaustResponse(mGet.getResponseBodyAsStream());
 
             } // else, body read by RemoteOeprationResult constructor