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

[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / ErrorMessageAdapter.java

diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index 9e077c0..9f13804 100644 (file)
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -210,13 +210,16 @@ public class ErrorMessageAdapter {
         } else if (operation instanceof SynchronizeFolderOperation) {
 
             if (!result.isSuccess()) {
         } else if (operation instanceof SynchronizeFolderOperation) {
 
             if (!result.isSuccess()) {

+                String folderPathName = new File(
+                        ((SynchronizeFolderOperation) operation).getFolderPath()).getName();

                 if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
                 if (result.getCode() == ResultCode.FILE_NOT_FOUND) {

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

 
                 } else {    // Generic error
                     // Show a Message, operation finished without success
 
                 } else {    // Generic error
                     // Show a Message, operation finished without success

-                    message = String.format(res.getString(R.string.downloader_download_folder_failed_content), new File(
-                            ((SynchronizeFolderOperation) operation).getFolderPath()).getName());
+                    message = String.format(res.getString(R.string.download_folder_failed_content),
+                            folderPathName);

                 }
             }
         }
                 }
             }
         }