Do not use AndroidObservable

This lets us return to an unmodified version of RxJava.

1 files changed, 7 insertions, 9 deletions

diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 11f19f5..a14a397 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -20,12 +20,12 @@ import cgeo.geocaching.ui.UserNameClickListener;
 import cgeo.geocaching.ui.logs.TrackableLogsViewCreator;
 import cgeo.geocaching.utils.HtmlUtils;
 import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.RxUtils;
 import cgeo.geocaching.utils.UnknownTagsHandler;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import rx.android.observables.AndroidObservable;
 import rx.android.observables.ViewObservable;
 import rx.functions.Action1;
 
@@ -524,14 +524,12 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
                     }
                 });
 
-                AndroidObservable.bindActivity(TrackableActivity.this,
-                        new HtmlImage(geocode, true, 0, false).fetchDrawable(trackable.getImage()))
-                        .subscribe(new Action1<BitmapDrawable>() {
-                            @Override
-                            public void call(final BitmapDrawable bitmapDrawable) {
-                                trackableImage.setImageDrawable(bitmapDrawable);
-                            }
-                        });
+                RxUtils.subscribeThenUI(new HtmlImage(geocode, true, 0, false).fetchDrawable(trackable.getImage()), new Action1<BitmapDrawable>() {
+                    @Override
+                    public void call(final BitmapDrawable bitmapDrawable) {
+                        trackableImage.setImageDrawable(bitmapDrawable);
+                    }
+                });
 
                 imageView.addView(trackableImage);
             }