From 8188d4fa922d4bef0b4f017efff96485f1308871 Mon Sep 17 00:00:00 2001 From: jabarros Date: Wed, 27 Aug 2014 10:01:28 +0200 Subject: [PATCH] Update messages for moving files operation results --- res/values/strings.xml | 6 +++--- src/com/owncloud/android/utils/ErrorMessageAdapter.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d3696501..69417069 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -290,9 +290,9 @@ Nothing in here. You can add a folder! Choose - Invalid move into descendent. - It is not possible to move one file where another with the same name exists. + It is not possible to move a folder into a descendant + The file exists already in the destination folder An error occurred while trying to move this file or folder - It is forbidden to move this file or folder. + to move this file diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java index 8604f6fb..04d34f4b 100644 --- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java +++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java @@ -196,7 +196,8 @@ public class ErrorMessageAdapter { message = res.getString(R.string.move_file_invalid_overwrite); } else if (result.getCode() == ResultCode.FORBIDDEN) { - message = res.getString(R.string.move_file_forbidden); + message = String.format(res.getString(R.string.forbidden_permissions), + res.getString(R.string.forbidden_permissions_move)); }else { // Generic error // Show a Message, operation finished without success -- 2.11.0