Merge branch 'develop' of github.com:AntennaPod/AntennaPod into develop

7 files changed, 36 insertions, 6 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 818864f79..21a0fa66f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -309,10 +309,9 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             return false;
         }
         Playable media = controller.getMedia();
+        boolean isFeedMedia = media != null && (media instanceof FeedMedia);
 
-        menu.findItem(R.id.support_item).setVisible(
-                media != null && media.getPaymentLink() != null &&
-                        (media instanceof FeedMedia) &&
+        menu.findItem(R.id.support_item).setVisible(isFeedMedia && media.getPaymentLink() != null &&
                         ((FeedMedia) media).getItem() != null &&
                         ((FeedMedia) media).getItem().getFlattrStatus().flattrable()
         );
@@ -320,20 +319,21 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         boolean hasWebsiteLink = media != null && media.getWebsiteLink() != null;
         menu.findItem(R.id.visit_website_item).setVisible(hasWebsiteLink);
 
-        boolean isItemAndHasLink = media != null && (media instanceof FeedMedia) &&
+        boolean isItemAndHasLink = isFeedMedia &&
                 ((FeedMedia) media).getItem() != null && ((FeedMedia) media).getItem().getLink() != null;
         menu.findItem(R.id.share_link_item).setVisible(isItemAndHasLink);
         menu.findItem(R.id.share_link_with_position_item).setVisible(isItemAndHasLink);
 
-        boolean isItemHasDownloadLink = media != null && (media instanceof FeedMedia) && ((FeedMedia) media).getDownload_url() != null;
+        boolean isItemHasDownloadLink = isFeedMedia && ((FeedMedia) media).getDownload_url() != null;
         menu.findItem(R.id.share_download_url_item).setVisible(isItemHasDownloadLink);
         menu.findItem(R.id.share_download_url_with_position_item).setVisible(isItemHasDownloadLink);
+        menu.findItem(R.id.share_file).setVisible(isFeedMedia && ((FeedMedia) media).fileExists());
 
         menu.findItem(R.id.share_item).setVisible(hasWebsiteLink || isItemAndHasLink || isItemHasDownloadLink);
 
         menu.findItem(R.id.add_to_favorites_item).setVisible(false);
         menu.findItem(R.id.remove_from_favorites_item).setVisible(false);
-        if(media != null && media instanceof FeedMedia) {
+        if (isFeedMedia) {
             menu.findItem(R.id.add_to_favorites_item).setVisible(!isFavorite);
             menu.findItem(R.id.remove_from_favorites_item).setVisible(isFavorite);
         }
@@ -574,6 +574,11 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
                             ShareUtils.shareFeedItemDownloadLink(this, ((FeedMedia) media).getItem(), true);
                         }
                         break;
+                    case R.id.share_file:
+                        if (media instanceof FeedMedia) {
+                            ShareUtils.shareFeedItemFile(this, ((FeedMedia) media));
+                        }
+                        break;
                     default:
                         return false;
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 6799114f7..57b7c359c 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -101,6 +101,8 @@ public class FeedItemMenuHandler {
             mi.setItemVisibility(R.id.share_download_url_with_position_item, false);
         }
 
+        mi.setItemVisibility(R.id.share_file, hasMedia && selectedItem.getMedia().fileExists());
+
         if (selectedItem.isPlayed()) {
             mi.setItemVisibility(R.id.mark_read_item, false);
         } else {
@@ -239,6 +241,9 @@ public class FeedItemMenuHandler {
             case R.id.share_download_url_with_position_item:
                 ShareUtils.shareFeedItemDownloadLink(context, selectedItem, true);
                 break;
+            case R.id.share_file:
+                ShareUtils.shareFeedItemFile(context, selectedItem.getMedia());
+                break;
             default:
                 Log.d(TAG, "Unknown menuItemId: " + menuItemId);
                 return false;
diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml
index c5356535c..7398b9118 100644
--- a/app/src/main/res/menu/allepisodes_context.xml
+++ b/app/src/main/res/menu/allepisodes_context.xml
@@ -71,6 +71,10 @@
                 android:id="@+id/share_download_url_with_position_item"
                 android:menuCategory="container"
                 android:title="@string/share_item_url_with_position_label" />
+            <item
+                android:id="@+id/share_file"
+                android:menuCategory="container"
+                android:title="@string/share_file_label" />
         </menu>
     </item>
 
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index 511758c2e..7e111d816 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -84,6 +84,10 @@
                 android:id="@+id/share_download_url_with_position_item"
                 android:menuCategory="container"
                 android:title="@string/share_item_url_with_position_label" />
+            <item
+                android:id="@+id/share_file"
+                android:menuCategory="container"
+                android:title="@string/share_file_label" />
         </menu>
     </item>
 
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index 271cb96a7..d3ec88bc7 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -73,6 +73,10 @@
                 android:id="@+id/share_download_url_with_position_item"
                 android:menuCategory="container"
                 android:title="@string/share_item_url_with_position_label" />
+            <item
+                android:id="@+id/share_file"
+                android:menuCategory="container"
+                android:title="@string/share_file_label" />
         </menu>
     </item>
 
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index c4086bf5e..530eb3400 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -64,6 +64,10 @@
                 android:id="@+id/share_download_url_with_position_item"
                 android:menuCategory="container"
                 android:title="@string/share_item_url_with_position_label" />
+            <item
+                android:id="@+id/share_file"
+                android:menuCategory="container"
+                android:title="@string/share_file_label" />
         </menu>
     </item>
     <item
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 3eb1d9d5e..e93d808c1 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -74,6 +74,10 @@
                 android:id="@+id/share_download_url_with_position_item"
                 android:menuCategory="container"
                 android:title="@string/share_item_url_with_position_label" />
+            <item
+                android:id="@+id/share_file"
+                android:menuCategory="container"
+                android:title="@string/share_file_label" />
         </menu>
     </item>
     <item