1 files changed, 30 insertions, 18 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 0d878b556..81ba8169f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -31,6 +31,8 @@ import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.IconDrawable;
 import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 
+import java.util.Locale;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
@@ -247,6 +249,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
             controller.release();
         }
         controller = newPlaybackController();
+        if(butPlay != null) {
+            butPlay.setOnClickListener(controller.newOnPlayButtonClickListener());
+        }
     }
 
     @Override
@@ -455,9 +460,10 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
                                 if(controller != null && controller.canSetPlaybackSpeed()) {
                                     float playbackSpeed = (progress + 10) / 20.0f;
                                     controller.setPlaybackSpeed(playbackSpeed);
-                                    String speed = String.format("%.2f", playbackSpeed);
-                                    UserPreferences.setPlaybackSpeed(speed);
-                                    txtvPlaybackSpeed.setText(speed + "x");
+                                    String speedPref = String.format(Locale.US, "%.2f", playbackSpeed);
+                                    UserPreferences.setPlaybackSpeed(speedPref);
+                                    String speedStr = String.format("%.2fx", playbackSpeed);
+                                    txtvPlaybackSpeed.setText(speedStr);
                                 } else if(fromUser) {
                                     float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
                                     barPlaybackSpeed.post(() -> {
@@ -876,7 +882,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
 
     private void updateButPlaybackSpeed() {
         if (controller != null && butPlaybackSpeed != null) {
-            butPlaybackSpeed.setText(UserPreferences.getPlaybackSpeed() + "x");
+            float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
+            String speedStr = String.format("%.2fx", speed);
+            butPlaybackSpeed.setText(speedStr);
         }
     }
 
@@ -896,21 +904,25 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
 
     private void checkFavorite() {
         Playable playable = controller.getMedia();
-            if (playable != null && playable instanceof FeedMedia) {
-                FeedItem feedItem = ((FeedMedia) playable).getItem();
-                if (feedItem != null) {
-                    Observable.fromCallable(() -> DBReader.getFeedItem(feedItem.getId()))
-                            .subscribeOn(Schedulers.newThread())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(item -> {
-                                boolean isFav = item.isTagged(FeedItem.TAG_FAVORITE);
-                                if(isFavorite != isFav) {
-                                    isFavorite = isFav;
-                                    invalidateOptionsMenu();
-                                }
-                            });
-                }
+        if (playable != null && playable instanceof FeedMedia) {
+            FeedItem feedItem = ((FeedMedia) playable).getItem();
+            if (feedItem != null) {
+                Observable.fromCallable(() -> DBReader.getFeedItem(feedItem.getId()))
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                        item -> {
+                            boolean isFav = item.isTagged(FeedItem.TAG_FAVORITE);
+                            if (isFavorite != isFav) {
+                                isFavorite = isFav;
+                                invalidateOptionsMenu();
+                            }
+                        }, error -> {
+                            Log.e(TAG, Log.getStackTraceString(error));
+                        }
+                    );
             }
+        }
     }
 
 }