From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 26 Aug 2014 17:32:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders
X-Git-Tag: oc-android-1.7.0_signed~197^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c928626bfa96918cbcffeb44b371e9feca63da52?hp=8cfafef514b1cd7979d7a8a4e71f34a9737a0cff

Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7107a3cc..d3696501 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -291,6 +291,8 @@
 	<string name="move_choose_button_text">Choose</string>
 
 	<string name="move_file_invalid_into_descendent">Invalid move into descendent.</string>
+	<string name="move_file_invalid_overwrite">It is not possible to move one file where another with the same name exists.</string>
 	<string name="move_file_error">An error occurred while trying to move this file or folder</string>
+	<string name="move_file_forbidden">It is forbidden to move this file or folder.</string>
 
 </resources>
diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index 84a9113a..8604f6fb 100644
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -192,7 +192,13 @@ public class ErrorMessageAdapter {
             if (result.getCode() == ResultCode.INVALID_MOVE_INTO_DESCENDANT)  {
                 message = res.getString(R.string.move_file_invalid_into_descendent);
 
-            } else {    // Generic error
+            } else if (result.getCode() == ResultCode.INVALID_OVERWRITE) {
+                message = res.getString(R.string.move_file_invalid_overwrite);
+
+            } else if (result.getCode() == ResultCode.FORBIDDEN) {
+                message = res.getString(R.string.move_file_forbidden);
+
+            }else {    // Generic error
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.move_file_error);
             }