diff options
| author | Andrew Dolgov <[email protected]> | 2013-02-11 16:19:12 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-02-11 16:19:12 +0400 |
| commit | 6f95c437658b0fe2fe367b16f33f72e54f20ac04 (patch) | |
| tree | 2a3fc722cc68f864d9d862f828d465c650413d06 /src/org | |
| parent | e2adb70fe06f1eea35d496ce15856c96c05edc05 (diff) | |
update support library
fix articlefragment link context menu
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 32 | ||||
| -rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 25 |
2 files changed, 25 insertions, 32 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 479463b0..0f85b335 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -44,10 +44,7 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl private SharedPreferences m_prefs;
private Article m_article;
private OnlineActivity m_activity;
- //private Article m_nextArticle;
- //private Article m_prevArticle;
private GestureDetector m_detector;
- private boolean m_visible = true;
public ArticleFragment() {
super();
@@ -62,35 +59,6 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl private View.OnTouchListener m_gestureListener;
@Override
- public boolean onContextItemSelected(MenuItem item) {
- /* AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
- .getMenuInfo(); */
-
- switch (item.getItemId()) {
- case R.id.article_link_share:
- if (m_visible) {
- ((OnlineActivity) getActivity()).shareArticle(m_article);
- }
- return true;
- case R.id.article_link_copy:
- if (m_visible) {
- ((OnlineActivity) getActivity()).copyToClipboard(m_article.link);
- }
- return true;
- default:
- Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
- return super.onContextItemSelected(item);
- }
- }
-
- @Override
- public void setUserVisibleHint(boolean visible) {
- super.setUserVisibleHint(visible);
-
- m_visible = visible;
- }
-
- @Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index e7a9dac5..ef94131b 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -528,6 +528,31 @@ public class OnlineActivity extends CommonActivity { }
@Override
+ public boolean onContextItemSelected(MenuItem item) {
+ /* AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
+ .getMenuInfo(); */
+
+ final ArticlePager ap = (ArticlePager)getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);
+
+ switch (item.getItemId()) {
+ case R.id.article_link_share:
+ if (ap != null && ap.getSelectedArticle() != null) {
+ shareArticle(ap.getSelectedArticle());
+ }
+ return true;
+ case R.id.article_link_copy:
+ Log.d(TAG, "article_link_copy");
+ if (ap != null && ap.getSelectedArticle() != null) {
+ copyToClipboard(ap.getSelectedArticle().link);
+ }
+ return true;
+ default:
+ Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
+ return super.onContextItemSelected(item);
+ }
+ }
+
+ @Override
public boolean onOptionsItemSelected(MenuItem item) {
final HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
final ArticlePager ap = (ArticlePager)getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);
|