summaryrefslogtreecommitdiff
path: root/app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java
diff options
context:
space:
mode:
authorMartin Fietz <martin.fietz@gmail.com>2018-09-30 19:58:53 +0200
committerMartin Fietz <martin.fietz@gmail.com>2018-09-30 19:58:53 +0200
commit3de661d9538b5f67fa6c3318a4096e7fe45c00e3 (patch)
tree71bd1294426b1edff5b65eee01bc08a38b99ef6c /app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java
parentc105a63165e6fcb42a3130153edfe24868956909 (diff)
downloadAntennaPod-3de661d9538b5f67fa6c3318a4096e7fe45c00e3.zip
Migrate rxjava to version 2
Diffstat (limited to 'app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java')
-rw-r--r--app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java b/app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java
index 4cde95d6f..670a1fb6e 100644
--- a/app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java
+++ b/app/src/play/java/de/danoeh/antennapod/dialog/CustomMRControllerDialog.java
@@ -41,10 +41,10 @@ import java.util.concurrent.ExecutionException;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.glide.ApGlideSettings;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
public class CustomMRControllerDialog extends MediaRouteControllerDialog {
public static final String TAG = "CustomMRContrDialog";
@@ -60,7 +60,7 @@ public class CustomMRControllerDialog extends MediaRouteControllerDialog {
private boolean viewsCreated = false;
- private Subscription fetchArtSubscription;
+ private Disposable fetchArtSubscription;
private MediaControllerCompat mediaController;
private MediaControllerCompat.Callback mediaControllerCallback;
@@ -327,7 +327,7 @@ public class CustomMRControllerDialog extends MediaRouteControllerDialog {
@Override
public void onDetachedFromWindow() {
if (fetchArtSubscription != null) {
- fetchArtSubscription.unsubscribe();
+ fetchArtSubscription.dispose();
fetchArtSubscription = null;
}
super.onDetachedFromWindow();
@@ -396,11 +396,11 @@ public class CustomMRControllerDialog extends MediaRouteControllerDialog {
}
if (fetchArtSubscription != null) {
- fetchArtSubscription.unsubscribe();
+ fetchArtSubscription.dispose();
}
fetchArtSubscription = Observable.fromCallable(() -> fetchArt(description))
- .subscribeOn(Schedulers.newThread())
+ .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(result -> {
fetchArtSubscription = null;