Show an alert message when user tries to move a file or folder to a location where...

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7107a3c..d369650 100644 (file)
--- 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_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_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>
 
 </resources>

diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index 84a9113..8604f6f 100644 (file)
--- 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);
 
             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);
             }
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.move_file_error);
             }