فهرست منبع

Included name of the 'lost' folder in the toast warning about current folder removed in the server

David A. Velasco 11 سال پیش
والد
کامیت
79493448d9
2فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 1 1
      res/values/strings.xml
  2. 3 1
      src/com/owncloud/android/ui/activity/FileDisplayActivity.java

+ 1 - 1
res/values/strings.xml

@@ -129,7 +129,7 @@
     <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
     <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
     <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
-	<string name="sync_current_folder_was_removed">Current folder does not exist</string>    
+	<string name="sync_current_folder_was_removed">Folder %1$s does not exist anymore</string>    
     <string name="foreign_files_move">"Move all"</string>
     <string name="foreign_files_success">"All files were moved"</string>
     <string name="foreign_files_fail">"Some files could not be moved"</string>

+ 3 - 1
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -877,7 +877,9 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
                 if (currentDir == null) {
                     // current folder was removed from the server 
-                    Toast.makeText(FileDisplayActivity.this, getString(R.string.sync_current_folder_was_removed), Toast.LENGTH_LONG)
+                    Toast.makeText( FileDisplayActivity.this, 
+                                    String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)), 
+                                    Toast.LENGTH_LONG)
                         .show();
                     onBackPressed();