Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit ff85ff2e authored Jun 22, 2015 by David A. Velasco

Merge branch 'master' into develop

parents 344d5b22 08831dfe

src/com/owncloud/android/lib/common/accounts/AccountUtils.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 );
	}		}

src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -391,6 +391,8 @@ 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 + " (" +