Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Local feeds: Do not display streaming confirmation (#4468)

Browse Source
This commit is contained in:
Herbert Reiter 2020-10-02 23:03:30 +02:00 committed by GitHub
parent 1d77ad472b
commit 41580b57cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -35,6 +35,7 @@ import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.webkit.URLUtil;
import android.widget.Toast; import android.widget.Toast;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
@ -482,7 +483,8 @@ public class PlaybackService extends MediaBrowserServiceCompat {
if (allowStreamAlways) { if (allowStreamAlways) {
UserPreferences.setAllowMobileStreaming(true); UserPreferences.setAllowMobileStreaming(true);
} }
if (stream && !NetworkUtils.isStreamingAllowed() && !allowStreamThisTime) { boolean localFeed = URLUtil.isContentUrl(playable.getStreamUrl());
if (stream && !NetworkUtils.isStreamingAllowed() && !allowStreamThisTime && !localFeed) {
displayStreamingNotAllowedNotification(intent); displayStreamingNotAllowedNotification(intent);
PlaybackPreferences.writeNoMediaPlaying(); PlaybackPreferences.writeNoMediaPlaying();
stateManager.stopService(); stateManager.stopService();
@ -668,7 +670,8 @@ public class PlaybackService extends MediaBrowserServiceCompat {
private void startPlayingFromPreferences() { private void startPlayingFromPreferences() {
Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext()); Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext());
if (playable != null) { if (playable != null) {
if (PlaybackPreferences.getCurrentEpisodeIsStream() && !NetworkUtils.isStreamingAllowed()) { boolean localFeed = URLUtil.isContentUrl(playable.getStreamUrl());
if (PlaybackPreferences.getCurrentEpisodeIsStream() && !NetworkUtils.isStreamingAllowed() && !localFeed) {
displayStreamingNotAllowedNotification( displayStreamingNotAllowedNotification(
new PlaybackServiceStarter(this, playable) new PlaybackServiceStarter(this, playable)
.prepareImmediately(true) .prepareImmediately(true)
@ -957,7 +960,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
} }
if (!nextItem.getMedia().localFileAvailable() && !NetworkUtils.isStreamingAllowed() if (!nextItem.getMedia().localFileAvailable() && !NetworkUtils.isStreamingAllowed()
&& UserPreferences.isFollowQueue()) { && UserPreferences.isFollowQueue() && !nextItem.getFeed().isLocalFeed()) {
displayStreamingNotAllowedNotification( displayStreamingNotAllowedNotification(
new PlaybackServiceStarter(this, nextItem.getMedia()) new PlaybackServiceStarter(this, nextItem.getMedia())
.prepareImmediately(true) .prepareImmediately(true)