From 0e1297fe457e398964d8763c3a7ec0e7c2092a6f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 26 Apr 2013 23:48:44 +0530 Subject: [PATCH] Fix crash when trying to edit individual file name in multiple upload Don't try to disable menu items when they don't exist --- .../media/MediaDetailPagerFragment.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 2789bc3cf..b2325030b 100644 --- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java @@ -138,15 +138,15 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa if(!editable) { // Disable menu options for editable views menu.clear(); // see http://stackoverflow.com/a/8495697/17865 inflater.inflate(R.menu.fragment_image_detail, menu); - } - if(pager != null) { - MediaDetailProvider provider = (MediaDetailProvider)getSherlockActivity(); - 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); - return; + if(pager != null) { + MediaDetailProvider provider = (MediaDetailProvider)getSherlockActivity(); + 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); + return; + } } } }