1 files changed, 7 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 683579f..88cad01 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -14,12 +14,14 @@ import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.ui.LoggingUI;
 import cgeo.geocaching.utils.Log;
-import cgeo.geocaching.utils.RxUtils;
 
 import org.apache.commons.lang3.StringUtils;
+
 import rx.Observable;
+import rx.android.observables.AndroidObservable;
 import rx.functions.Action1;
 import rx.functions.Func0;
+import rx.schedulers.Schedulers;
 
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -79,13 +81,13 @@ public abstract class AbstractPopupActivity extends AbstractActivity implements
         if (!cache.supportsGCVote()) {
             return;
         }
-        RxUtils.subscribeOnIOThenUI(Observable.defer(new Func0<Observable<GCVoteRating>>() {
+        AndroidObservable.bindActivity(this, Observable.defer(new Func0<Observable<GCVoteRating>>() {
             @Override
             public Observable<GCVoteRating> call() {
                 final GCVoteRating rating = GCVote.getRating(cache.getGuid(), geocode);
                 return rating != null ? Observable.just(rating) : Observable.<GCVoteRating>empty();
             }
-        }), new Action1<GCVoteRating>() {
+        })).subscribe(new Action1<GCVoteRating>() {
             @Override
             public void call(final GCVoteRating rating) {
                 cache.setRating(rating.getRating());
@@ -93,7 +95,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity implements
                 DataStore.saveChangedCache(cache);
                 details.addRating(cache);
             }
-        });
+        }, Schedulers.io());
     }
 
     protected void init() {
@@ -160,11 +162,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity implements
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
@@ -255,7 +252,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity implements
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public final void goDefaultNavigation(@SuppressWarnings("unused") View view) {
+    public final void goDefaultNavigation(View view) {
         navigateTo();
         finish();
     }