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

Commit 8f87ad78 authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into fix_shared_by_link_for_server_without_uploads

parents a22b1da1 ff85ff2e

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

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class AccountUtils { 


		if (client != null) {

			String cookiesString = client.getCookiesString();

			if (cookiesString != "") {

			if (!"".equals(cookiesString)) {

				ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); 

				// Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );

			}

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

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