flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
David A. Velasco 2015-06-22 11:15:46 +02:00
commit ff85ff2eef
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -232,7 +232,7 @@ public class AccountUtils {
if (client != null) { if (client != null) {
String cookiesString = client.getCookiesString(); String cookiesString = client.getCookiesString();
if (cookiesString != "") { if (!"".equals(cookiesString)) {
ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString);
// Log_OC.d(TAG, "Saving Cookies: "+ cookiesString ); // Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
} }

4
src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
View File

@ -391,7 +391,9 @@ public class RemoteOperationResult implements Serializable {
return "Authenticated with a different account than the one updating"; return "Authenticated with a different account than the one updating";
} else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) { } else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) {
return "The file name contains an forbidden character"; 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 + " (" + return "Operation finished with HTTP status code " + mHttpCode + " (" +
(isSuccess() ? "success" : "fail") + ")"; (isSuccess() ? "success" : "fail") + ")";