1 files changed, 14 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index b82614b..42dd58d 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -21,7 +21,6 @@ import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.dialog.Dialogs;
 import cgeo.geocaching.utils.DatabaseBackupUtils;
 import cgeo.geocaching.utils.Log;
-import cgeo.geocaching.utils.RxUtils;
 import cgeo.geocaching.utils.Version;
 
 import com.google.zxing.integration.android.IntentIntegrator;
@@ -30,7 +29,9 @@ import org.apache.commons.lang3.StringUtils;
 import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
+import rx.android.observables.AndroidObservable;
 import rx.functions.Action1;
+import rx.schedulers.Schedulers;
 import rx.subscriptions.Subscriptions;
 
 import android.app.AlertDialog;
@@ -551,13 +552,13 @@ public class MainActivity extends AbstractActivity {
                             }
                         }
                     });
-                    RxUtils.subscribeOnIOThenUI(address.onErrorResumeNext(Observable.from(geo.getCoords().toString())),
-                            new Action1<String>() {
+                    AndroidObservable.bindActivity(MainActivity.this, address.onErrorResumeNext(Observable.from(geo.getCoords().toString())))
+                            .subscribe(new Action1<String>() {
                                 @Override
                                 public void call(final String address) {
                                     navLocation.setText(address);
                                 }
-                            });
+                            }, Schedulers.io());
                 }
             } else {
                 navLocation.setText(geo.getCoords().toString());
@@ -569,7 +570,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoFindOnMap(@SuppressWarnings("unused") final View v) {
+    public void cgeoFindOnMap(final View v) {
         findOnMap.setPressed(true);
         CGeoMap.startActivityLiveMap(this);
     }
@@ -578,7 +579,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoFindNearest(@SuppressWarnings("unused") final View v) {
+    public void cgeoFindNearest(final View v) {
         if (app.currentGeo().getCoords() == null) {
             return;
         }
@@ -591,7 +592,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoFindByOffline(@SuppressWarnings("unused") final View v) {
+    public void cgeoFindByOffline(final View v) {
         findByOffline.setPressed(true);
         CacheListActivity.startActivityOffline(this);
     }
@@ -600,7 +601,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoSearch(@SuppressWarnings("unused") final View v) {
+    public void cgeoSearch(final View v) {
         advanced.setPressed(true);
         startActivity(new Intent(this, SearchActivity.class));
     }
@@ -609,7 +610,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoPoint(@SuppressWarnings("unused") final View v) {
+    public void cgeoPoint(final View v) {
         any.setPressed(true);
         startActivity(new Intent(this, NavigateAnyPointActivity.class));
     }
@@ -618,7 +619,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoFilter(@SuppressWarnings("unused") final View v) {
+    public void cgeoFilter(final View v) {
         filter.setPressed(true);
         filter.performClick();
     }
@@ -627,7 +628,7 @@ public class MainActivity extends AbstractActivity {
      * @param v
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void cgeoNavSettings(@SuppressWarnings("unused") final View v) {
+    public void cgeoNavSettings(final View v) {
         startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
     }
 
@@ -708,7 +709,7 @@ public class MainActivity extends AbstractActivity {
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void showAbout(@SuppressWarnings("unused") final View view) {
+    public void showAbout(final View view) {
         startActivity(new Intent(this, AboutActivity.class));
     }
 
@@ -716,7 +717,7 @@ public class MainActivity extends AbstractActivity {
      * @param view
      *            unused here but needed since this method is referenced from XML layout
      */
-    public void goSearch(@SuppressWarnings("unused") final View view) {
+    public void goSearch(final View view) {
         onSearchRequested();
     }