Change error message when trying download a folder that does not exist

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 249f256..a4c25f8 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -323,7 +323,6 @@
        <string name="prefs_category_security">Security</string>
 
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
        <string name="prefs_category_security">Security</string>
 
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>

-    <string name="download_folder_not_found">The %1$s folder is no longer available on the server</string>

     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
 
 </resources>
     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
 
 </resources>

diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index 992f0f6..9f13804 100644 (file)
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -213,7 +213,7 @@ public class ErrorMessageAdapter {
                 String folderPathName = new File(
                         ((SynchronizeFolderOperation) operation).getFolderPath()).getName();
                 if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
                 String folderPathName = new File(
                         ((SynchronizeFolderOperation) operation).getFolderPath()).getName();
                 if (result.getCode() == ResultCode.FILE_NOT_FOUND) {

-                    message = String.format(res.getString(R.string.download_folder_not_found),
+                    message = String.format(res.getString(R.string.sync_current_folder_was_removed),

                             folderPathName);
 
                 } else {    // Generic error
                             folderPathName);
 
                 } else {    // Generic error