diff options
| author | Andrew Dolgov <[email protected]> | 2017-06-01 12:31:14 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-06-01 12:31:14 +0300 |
| commit | b7b4d29395847ae395c828cd31bd757d458d4fea (patch) | |
| tree | bf428a38881fb2880741593d1ef50899976c7687 | |
| parent | 4582e6afefa4e2ebe9e036df3fd6e9b93cf8d3bc (diff) | |
when using flavor image overflow menu prefer stream URI is available for sharing etc
3 files changed, 9 insertions, 7 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 6f411418..5a90cc1a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1147,15 +1147,18 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { + + Uri mediaUri = Uri.parse(article.flavorStreamUri != null ? article.flavorStreamUri : article.flavorImageUri); + switch (item.getItemId()) { case R.id.article_img_open: - m_activity.openUri(Uri.parse(article.flavorImageUri)); + m_activity.openUri(mediaUri); return true; case R.id.article_img_copy: - m_activity.copyToClipboard(article.flavorImageUri); + m_activity.copyToClipboard(mediaUri.toString()); return true; case R.id.article_img_share: - m_activity.shareText(article.flavorImageUri); + m_activity.shareText(mediaUri.toString()); return true; case R.id.article_img_view_caption: m_activity.displayImageCaption(article.flavorImageUri, article.content); diff --git a/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml b/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml index 33b60653..67dbd6d8 100644 --- a/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml +++ b/org.fox.ttrss/src/main/res/menu/context_article_content_img.xml @@ -12,8 +12,8 @@ <item android:id="@+id/article_img_share" android:icon="@drawable/ic_share" - app:showAsAction="ifRoom" - android:title="@string/article_img_share"/> + app:showAsAction="" + android:title="@string/article_media_share"/> <item android:id="@+id/article_img_view_caption" app:showAsAction="" diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 2b59e50e..10a89d51 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -164,8 +164,7 @@ <string name="headlines_starred">Starred</string> <string name="headlines_published">Published</string> <string name="headlines_unread">Unread</string> - <string name="article_img_open">Open image</string> - <string name="article_img_share">Share image</string> + <string name="article_media_share">Share</string> <string name="article_img_view_caption">View Caption</string> <string name="pref_headlines_mark_read_scroll">Mark read on scroll</string> <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string> |