diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2017-06-05 11:25:18 +0200 |
|---|---|---|
| committer | Martin Fietz <Martin.Fietz@gmail.com> | 2017-06-05 11:25:18 +0200 |
| commit | a8d72b3c6f3af996d57fc571d029187d88dcfd20 (patch) | |
| tree | 434dd00b5105836efd445ed95e2bc421bf9c8e0a /core | |
| parent | d603130b44284c234f0a0341f4ce9ec69899da99 (diff) | |
| parent | 341928b3bac5ee86f04251790488c4b0a259387a (diff) | |
| download | AntennaPod-a8d72b3c6f3af996d57fc571d029187d88dcfd20.zip | |
Merge branch 'develop' of github.com:AntennaPod/AntennaPod into develop
Diffstat (limited to 'core')
4 files changed, 14 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java index e0abe0efb..9bbeb7c88 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java +++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java @@ -21,7 +21,7 @@ public class FeedUpdateReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { Log.d(TAG, "Received intent"); ClientConfig.initialize(context); - if (NetworkUtils.isDownloadAllowed()) { + if (NetworkUtils.networkAvailable() && NetworkUtils.isDownloadAllowed()) { DBTasks.refreshAllFeeds(context, null); } else { Log.d(TAG, "Blocking automatic update: no wifi available / no mobile updates allowed"); 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 35916a604..887c0055c 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 @@ -3,9 +3,13 @@ package de.danoeh.antennapod.core.util; import android.content.Context; import android.content.Intent; +import android.net.Uri; import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.FeedItem; +import de.danoeh.antennapod.core.feed.FeedMedia; + +import java.io.File; /** Utility methods for sharing data */ public class ShareUtils { @@ -58,4 +62,11 @@ public class ShareUtils { shareLink(context, text); } + public static void shareFeedItemFile(Context context, FeedMedia media) { + Intent i = new Intent(Intent.ACTION_SEND); + i.setType(media.getMime_type()); + i.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(media.getLocalMediaUrl()))); + i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + context.startActivity(Intent.createChooser(i, context.getString(R.string.share_file_label))); + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index 6251cc4a0..9d3854f41 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -461,6 +461,7 @@ public abstract class PlaybackController { checkMediaInfoLoaded(); postStatusMsg(R.string.player_ready_msg, false); updatePlayButtonAppearance(playResource, playText); + onPositionObserverUpdate(); break; case SEEKING: onPositionObserverUpdate(); diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index b82a03801..86cff515f 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -126,6 +126,7 @@ <string name="remove_feed_label">Remove Podcast</string> <string name="share_label">Share…</string> <string name="share_link_label">Share Link</string> + <string name="share_file_label">Share File</string> <string name="share_link_with_position_label">Share Link with Position</string> <string name="share_feed_url_label">Share Feed URL</string> <string name="share_item_url_label">Share Episode File URL</string> |