فهرست منبع

Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it

jabarros 10 سال پیش
والد
کامیت
622d78906b
2فایلهای تغییر یافته به همراه9 افزوده شده و 1 حذف شده
  1. 2 0
      res/values/strings.xml
  2. 7 1
      src/com/owncloud/android/utils/ErrorMessageAdapter.java

+ 2 - 0
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>

+ 7 - 1
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);
             }