From 4f52b875d10b73478b5b5303210b8867087c3292 Mon Sep 17 00:00:00 2001 From: LukeOwncloud Date: Fri, 12 Dec 2014 14:39:22 +0100 Subject: [PATCH 1/3] added log message for ResultCode.FILE_NOT_FOUND --- .../android/lib/common/operations/RemoteOperationResult.java | 4 +++- 1 file changed, 3 insertions(+), 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 861db55e..80fa9434 100644 --- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -350,7 +350,9 @@ public class RemoteOperationResult implements Serializable { return "Authenticated with a different account than the one updating"; } else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) { return "The file name contains an forbidden character"; - } + } else if (mCode == ResultCode.FILE_NOT_FOUND) { + return "Local file does not exist"; + } return "Operation finished with HTTP status code " + mHttpCode + " (" + (isSuccess() ? "success" : "fail") + ")"; From 267c7cfd08e49758388a886c7c6c4e9dc536d364 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 2 Jun 2015 16:51:25 +0200 Subject: [PATCH 2/3] Use .equals instead of != This code never worked. Please consider adding unit tests. --- src/com/owncloud/android/lib/common/accounts/AccountUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index 586fd3f8..65d33335 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -218,7 +218,7 @@ public class AccountUtils { if (client != null) { String cookiesString = client.getCookiesString(); - if (cookiesString != "") { + if (!cookiesString.equals("")) { ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString ); } From b102d1cdf965f51a386805e0ae8b8a18dbe9ab30 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 2 Jun 2015 16:56:35 +0200 Subject: [PATCH 3/3] Change the order to prevent NullPointerExceptions --- src/com/owncloud/android/lib/common/accounts/AccountUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index 65d33335..d2841c38 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -218,7 +218,7 @@ public class AccountUtils { if (client != null) { String cookiesString = client.getCookiesString(); - if (!cookiesString.equals("")) { + if (!"".equals(cookiesString)) { ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString ); }