diff --git a/commons/res/menu/fragment_image_detail.xml b/commons/res/menu/fragment_image_detail.xml index 4425559c8..c91e4cf34 100644 --- a/commons/res/menu/fragment_image_detail.xml +++ b/commons/res/menu/fragment_image_detail.xml @@ -11,5 +11,19 @@ android:icon="@android:drawable/ic_menu_view" android:title="@string/menu_open_in_browser" /> + + \ No newline at end of file diff --git a/commons/res/values-qq/strings.xml b/commons/res/values-qq/strings.xml index d923c09c5..7785154ad 100644 --- a/commons/res/values-qq/strings.xml +++ b/commons/res/values-qq/strings.xml @@ -71,4 +71,6 @@ Menu item text that prompts user to send feedback to WMF via email Message shown on contributions list during first sync. Message shown on contribution list during non-first sync if no uploads present. + Menu item text prompting user to retry a failed upload. + Menu item text prompting user to abort and delete a failed upload. diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml index 70f494b41..54bd65477 100644 --- a/commons/res/values/strings.xml +++ b/commons/res/values/strings.xml @@ -84,4 +84,7 @@ Waiting for first sync... You have not yet uploaded any photos. + + Retry + Abort diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java index b2325030b..40929fc6d 100644 --- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java @@ -143,8 +143,10 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa Media m = provider.getMediaAtPosition(pager.getCurrentItem()); if(m != null && !m.getFilename().startsWith("File:")) { // Crude way of checking if the file has been successfully saved! - menu.findItem(R.id.menu_browser_current_image).setEnabled(false); - menu.findItem(R.id.menu_share_current_image).setEnabled(false); + menu.findItem(R.id.menu_browser_current_image).setEnabled(false).setVisible(false); + menu.findItem(R.id.menu_share_current_image).setEnabled(false).setVisible(false); + menu.findItem(R.id.menu_retry_current_image).setEnabled(true).setVisible(true); + menu.findItem(R.id.menu_abort_current_image).setEnabled(true).setVisible(true); return; } }