Combine 'Episode webpage' & 'Media file address' share options (#5626)

2 files changed, 20 insertions, 22 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
index 34b9d294d..974519400 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
@@ -43,14 +43,6 @@ public class ShareUtils {
         shareLink(context, feed.getTitle() + ": " + feed.getDownload_url());
     }
 
-    public static void shareFeedItemLink(Context context, FeedItem item) {
-        shareFeedItemLink(context, item, false);
-    }
-
-    public static void shareFeedItemDownloadLink(Context context, FeedItem item) {
-        shareFeedItemDownloadLink(context, item, false);
-    }
-
     private static String getItemShareText(FeedItem item) {
         return item.getFeed().getTitle() + ": " + item.getTitle();
     }
@@ -59,21 +51,26 @@ public class ShareUtils {
         return FeedItemUtil.getLinkWithFallback(item) != null;
     }
 
-    public static void shareFeedItemLink(Context context, FeedItem item, boolean withPosition) {
-        String text = getItemShareText(item) + " " + FeedItemUtil.getLinkWithFallback(item);
-        if (withPosition) {
-            int pos = item.getMedia().getPosition();
-            text += " [" + Converter.getDurationStringLong(pos) + "]";
+    public static void shareFeedItemLinkWithDownloadLink(Context context, FeedItem item, boolean withPosition) {
+        String text = getItemShareText(item);
+        int pos = 0;
+        if (item.getMedia() != null && withPosition) {
+            text += "\n" + context.getResources().getString(R.string.share_starting_position_label) + ": ";
+            pos = item.getMedia().getPosition();
+            text +=  Converter.getDurationStringLong(pos);
+        }
+
+        if (hasLinkToShare(item)) {
+            text +=  "\n\n" + context.getResources().getString(R.string.share_dialog_episode_website_label) + ": ";
+            text += FeedItemUtil.getLinkWithFallback(item);
         }
-        shareLink(context, text);
-    }
 
-    public static void shareFeedItemDownloadLink(Context context, FeedItem item, boolean withPosition) {
-        String text = getItemShareText(item) + " " + item.getMedia().getDownload_url();
-        if (withPosition) {
-            int pos = item.getMedia().getPosition();
-            text += "#t=" + pos / 1000;
-            text += " [" + Converter.getDurationStringLong(pos) + "]";
+        if (item.getMedia() != null && item.getMedia().getDownload_url() != null) {
+            text += "\n\n" + context.getResources().getString(R.string.share_dialog_media_file_label) + ": ";
+            text +=  item.getMedia().getDownload_url();
+            if (withPosition) {
+                text += "#t=" + pos / 1000;
+            }
         }
         shareLink(context, text);
     }
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index d6915b76b..d011b9cf1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -779,9 +779,10 @@
     <!-- Share episode dialog -->
     <string name="share_dialog_include_label">Include:</string>
     <string name="share_playback_position_dialog_label">Playback position</string>
-    <string name="share_dialog_media_file_url_label">Media file address</string>
     <string name="share_dialog_episode_website_label">Episode webpage</string>
+    <string name="share_dialog_link_to_episode">Link to episode</string>
     <string name="share_dialog_media_file_label">Media file</string>
+    <string name="share_starting_position_label">Starting from</string>
 
     <!-- Audio controls -->
     <string name="audio_controls">Audio controls</string>