Do not use AndroidObservable

This lets us return to an unmodified version of RxJava.

1 files changed, 7 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 31a61b5..d3f107a 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -6,11 +6,11 @@ import cgeo.geocaching.files.LocalStorage;
 import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.RxUtils;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import rx.Subscription;
-import rx.android.observables.AndroidObservable;
 import rx.functions.Action0;
 import rx.functions.Action1;
 import rx.subscriptions.CompositeSubscription;
@@ -116,13 +116,12 @@ public class ImagesList {
 
             final ImageView imageView = (ImageView) inflater.inflate(R.layout.image_item, null);
             assert(imageView != null);
-            subscriptions.add(AndroidObservable.bindActivity(activity, imgGetter.fetchDrawable(img.getUrl()))
-                    .subscribe(new Action1<BitmapDrawable>() {
-                        @Override
-                        public void call(final BitmapDrawable image) {
-                            display(imageView, image, img, rowView);
-                        }
-                    }));
+            subscriptions.add(RxUtils.subscribeThenUI(imgGetter.fetchDrawable(img.getUrl()), new Action1<BitmapDrawable>() {
+                @Override
+                public void call(final BitmapDrawable image) {
+                    display(imageView, image, img, rowView);
+                }
+            }));
             rowView.addView(imageView);
             imagesView.addView(rowView);
         }