Merge branch 'master' into develop

3 files changed, 13 insertions, 17 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
index af86db633..c3b412012 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
@@ -22,6 +22,8 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.util.Util;
 
 import io.reactivex.Observable;
@@ -201,8 +203,12 @@ public class ExoPlayerWrapper implements IPlayer {
 
     @Override
     public void setDataSource(String s) throws IllegalArgumentException, IllegalStateException {
-        DataSource.Factory dataSourceFactory =
-                new DefaultDataSourceFactory(mContext, Util.getUserAgent(mContext, mContext.getPackageName()), null);
+        DefaultHttpDataSourceFactory httpDataSourceFactory = new DefaultHttpDataSourceFactory(
+                Util.getUserAgent(mContext, mContext.getPackageName()), null,
+                DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
+                DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
+                true);
+        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(mContext, null, httpDataSourceFactory);
         ExtractorMediaSource.Factory f = new ExtractorMediaSource.Factory(dataSourceFactory);
         mediaSource = f.createMediaSource(Uri.parse(s));
     }
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 ace89e40a..a3535616e 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
@@ -451,7 +451,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     notificationBuilder.loadIcon(getPlayable());
                 }
             }
-            startForeground(NOTIFICATION_ID, notificationBuilder.build());
+            stateManager.startForeground(NOTIFICATION_ID, notificationBuilder.build());
         }
 
         NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/exception/RxJavaErrorHandlerSetup.java b/core/src/main/java/de/danoeh/antennapod/core/util/exception/RxJavaErrorHandlerSetup.java
index 12f0c1c6e..223104d2e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/exception/RxJavaErrorHandlerSetup.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/exception/RxJavaErrorHandlerSetup.java
@@ -1,12 +1,9 @@
 package de.danoeh.antennapod.core.util.exception;
 
 import android.util.Log;
-import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException;
 import io.reactivex.exceptions.UndeliverableException;
 import io.reactivex.plugins.RxJavaPlugins;
 
-import java.io.InterruptedIOException;
-
 public class RxJavaErrorHandlerSetup {
 
     private RxJavaErrorHandlerSetup() {
@@ -14,21 +11,14 @@ public class RxJavaErrorHandlerSetup {
     }
 
     public static void setupRxJavaErrorHandler() {
-        RxJavaPlugins.setErrorHandler(originalCause -> {
-            Throwable e = originalCause;
+        RxJavaPlugins.setErrorHandler(e -> {
             if (e instanceof UndeliverableException) {
-                e = e.getCause();
-            }
-            if (e instanceof GpodnetServiceException) {
-                e = e.getCause();
-            }
-            if (e instanceof InterruptedException || e instanceof InterruptedIOException) {
-                // fine, some blocking code was interrupted by a dispose call
-                Log.d("RxJavaErrorHandler", "Ignored exception: " + Log.getStackTraceString(originalCause));
+                // Probably just disposed because the fragment was left
+                Log.d("RxJavaErrorHandler", "Ignored exception: " + Log.getStackTraceString(e));
                 return;
             }
             Thread.currentThread().getUncaughtExceptionHandler()
-                    .uncaughtException(Thread.currentThread(), originalCause);
+                    .uncaughtException(Thread.currentThread(), e);
         });
     }
 }