Merge branch 'develop' into feeditem-viewpager

app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java

@@ -653,14 +653,16 @@ public class QueueFragment extends Fragment {
 
     private void refreshInfoBar() {
         String info = queue.size() + getString(R.string.episodes_suffix);
-        if(queue.size() > 0) {
+        if (queue.size() > 0) {
             long timeLeft = 0;
-            for(FeedItem item : queue) {
-                float playbackSpeed = PlaybackSpeedUtils.getCurrentPlaybackSpeed(item.getMedia());
-                if(item.getMedia() != null) {
-                    timeLeft +=
-                            (long) ((item.getMedia().getDuration() - item.getMedia().getPosition())
-                                    / playbackSpeed);
+            for (FeedItem item : queue) {
+                float playbackSpeed = 1;
+                if (UserPreferences.timeRespectsSpeed()) {
+                    playbackSpeed = PlaybackSpeedUtils.getCurrentPlaybackSpeed(item.getMedia());
+                }
+                if (item.getMedia() != null) {
+                    long itemTimeLeft = item.getMedia().getDuration() - item.getMedia().getPosition();
+                    timeLeft += itemTimeLeft / playbackSpeed;
                 }
             }
             info += " • ";

app/src/main/java/de/danoeh/antennapod/fragment/preferences/AutoDownloadPreferencesFragment.java

@@ -50,7 +50,7 @@ public class AutoDownloadPreferencesFragment extends PreferenceFragmentCompat {
     @Override
     public void onStart() {
         super.onStart();
-        ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.auto_download_label);
+        ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.pref_automatic_download_title);
     }
 
     @Override

core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java

@@ -32,7 +32,35 @@ import de.danoeh.antennapod.core.util.ShownotesProvider;
 public class Timeline {
     private static final String TAG = "Timeline";
 
-    private static final String WEBVIEW_STYLE = "@font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 13pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } a.timecode { color: #669900; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }";
+    private static final String WEBVIEW_STYLE =
+            "@font-face {"
+            + "font-family: 'Roboto-Light';"
+            + "src: url('file:///android_asset/Roboto-Light.ttf');"
+            + "}"
+            + "* {"
+            + "color: %s;"
+            + "font-family: roboto-Light;"
+            + "font-size: 13pt;"
+            + "overflow-wrap: break-word;"
+            + "}"
+            + "a {"
+            + "font-style: normal;"
+            + "text-decoration: none;"
+            + "font-weight: normal;"
+            + "color: #00A8DF;"
+            + "}"
+            + "a.timecode {"
+            + "color: #669900;"
+            + "}"
+            + "img {"
+            + "display: block;"
+            + "margin: 10 auto;"
+            + "max-width: %s;"
+            + "height: auto;"
+            + "}"
+            + "body {"
+            + "margin: %dpx %dpx %dpx %dpx;"
+            + "}";
 
 
     private ShownotesProvider shownotesProvider;