Merge branch 'master' into develop

4 files changed, 12 insertions, 5 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/util/PlaybackSpeedUtils.java b/core/src/main/java/de/danoeh/antennapod/core/feed/util/PlaybackSpeedUtils.java
index 0d5ecbb71..d6740994d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/util/PlaybackSpeedUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/util/PlaybackSpeedUtils.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.core.feed.util;
 
+import android.util.Log;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
@@ -14,6 +15,7 @@ import static de.danoeh.antennapod.core.feed.FeedPreferences.SPEED_USE_GLOBAL;
  * Utility class to use the appropriate playback speed based on {@link PlaybackPreferences}
  */
 public final class PlaybackSpeedUtils {
+    private static final String TAG = "PlaybackSpeedUtils";
 
     private PlaybackSpeedUtils() {
     }
@@ -33,8 +35,10 @@ public final class PlaybackSpeedUtils {
                 FeedItem item = ((FeedMedia) media).getItem();
                 if (item != null) {
                     Feed feed = item.getFeed();
-                    if (feed != null) {
+                    if (feed != null && feed.getPreferences() != null) {
                         playbackSpeed = feed.getPreferences().getFeedPlaybackSpeed();
+                    } else {
+                        Log.d(TAG, "Can not get feed specific playback speed: " + feed);
                     }
                 }
             }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 60075dda6..69b35bff5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -517,11 +517,12 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(
                                 playableLoaded -> {
-                                    mediaPlayer.playMediaObject(playable, stream, startWhenPrepared,
+                                    mediaPlayer.playMediaObject(playableLoaded, stream, startWhenPrepared,
                                             prepareImmediately);
-                                    addPlayableToQueue(playable);
+                                    addPlayableToQueue(playableLoaded);
                                 }, error -> {
                                     Log.d(TAG, "Playable was not found. Stopping service.");
+                                    error.printStackTrace();
                                     stateManager.stopService();
                                 });
                 return Service.START_NOT_STICKY;
@@ -729,6 +730,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                             addPlayableToQueue(playable);
                         }, error -> {
                             Log.d(TAG, "Playable was not loaded from preferences. Stopping service.");
+                            error.printStackTrace();
                             stateManager.stopService();
                         });
     }
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 13ff092b0..1ab44d847 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -236,7 +236,7 @@
     <string-array name="media_player_options">
         <item>@string/media_player_builtin</item>
         <item>@string/media_player_sonic</item>
-        <item>@string/media_player_exoplayer</item>
+        <item>@string/media_player_exoplayer_recommended</item>
     </string-array>
 
     <string-array name="media_player_values">
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 82bb0ced0..7da2bff72 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -501,7 +501,7 @@
     <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
     <string name="media_player_builtin">Built-in Android player</string>
     <string name="media_player_sonic" translatable="false">Sonic Media Player</string>
-    <string name="media_player_exoplayer" translatable="false">ExoPlayer</string>
+    <string name="media_player_exoplayer_recommended">ExoPlayer (recommended)</string>
     <string name="media_player_switch_to_exoplayer">Switch to ExoPlayer</string>
     <string name="media_player_switched_to_exoplayer">Switched to ExoPlayer.</string>
     <string name="pref_skip_silence_title">Skip Silence in Audio</string>
@@ -739,6 +739,7 @@
     <string name="reconnect_local_folder">Re-connect local folder</string>
     <string name="reconnect_local_folder_warning">In case of permission denials, you can use this to re-connect to the exact same folder. Do not select another folder.</string>
     <string name="local_feed_description">This virtual podcast was created by adding a folder to AntennaPod.</string>
+    <string name="unable_to_start_system_file_manager">Unable to start system file manager</string>
 
     <string name="filter">Filter</string>