diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-09-18 22:41:24 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-09-18 22:41:24 +0200 |
| commit | 7c2c7be1610f53e92d06af1c066125fc65207ffa (patch) | |
| tree | 17c365ccd1e15c9245c7d5612abeb0e731e149b1 /main/src/cgeo/geocaching/CacheDetailActivity.java | |
| parent | 1a207785584c726a780f57318874c644ff0eaa0f (diff) | |
| parent | 872eb90546207ff18e5b5a0dbd6729353af548ef (diff) | |
| download | cgeo-7c2c7be1610f53e92d06af1c066125fc65207ffa.zip cgeo-7c2c7be1610f53e92d06af1c066125fc65207ffa.tar.gz cgeo-7c2c7be1610f53e92d06af1c066125fc65207ffa.tar.bz2 | |
Merge branch 'issue-4369' into upstream
Diffstat (limited to 'main/src/cgeo/geocaching/CacheDetailActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index f004ca9..d826fee 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1896,12 +1896,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); final CharSequence itemTitle = ((TextView) ((View) view.getParent()).findViewById(R.id.name)).getText(); - buildDetailsContextMenu(actionMode, menu, clickedItemText, itemTitle, true); + buildDetailsContextMenu(actionMode, menu, itemTitle, true); return true; case R.id.shortdesc: assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); - buildDetailsContextMenu(actionMode, menu, clickedItemText, res.getString(R.string.cache_description), false); + buildDetailsContextMenu(actionMode, menu, res.getString(R.string.cache_description), false); return true; case R.id.longdesc: assert view instanceof TextView; @@ -1912,27 +1912,27 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } else { clickedItemText = shortDesc + "\n\n" + ((TextView) view).getText(); } - buildDetailsContextMenu(actionMode, menu, clickedItemText, res.getString(R.string.cache_description), false); + buildDetailsContextMenu(actionMode, menu, res.getString(R.string.cache_description), false); return true; case R.id.personalnote: assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); - buildDetailsContextMenu(actionMode, menu, clickedItemText, res.getString(R.string.cache_personal_note), true); + buildDetailsContextMenu(actionMode, menu, res.getString(R.string.cache_personal_note), true); return true; case R.id.hint: assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); - buildDetailsContextMenu(actionMode, menu, clickedItemText, res.getString(R.string.cache_hint), false); + buildDetailsContextMenu(actionMode, menu, res.getString(R.string.cache_hint), false); return true; case R.id.log: assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); - buildDetailsContextMenu(actionMode, menu, clickedItemText, res.getString(R.string.cache_logs), false); + buildDetailsContextMenu(actionMode, menu, res.getString(R.string.cache_logs), false); return true; case R.id.date: // event date assert view instanceof TextView; clickedItemText = ((TextView) view).getText(); - buildDetailsContextMenu(actionMode, menu, clickedItemText, res.getString(R.string.cache_event), true); + buildDetailsContextMenu(actionMode, menu, res.getString(R.string.cache_event), true); menu.findItem(R.id.menu_calendar).setVisible(cache.canBeAddedToCalendar()); return true; } |