aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/MainActivity.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-03-22 10:48:16 +0100
committerSamuel Tardieu <sam@rfc1149.net>2014-03-22 14:26:11 +0100
commitdfa81310d0e5d6925d93bc089f7b526d7c344b11 (patch)
tree1000fe164d1a9ff9bc5471c82f99197c22dc15c0 /main/src/cgeo/geocaching/MainActivity.java
parentf0315a36dee4ef1992cea308868b6c221462dd68 (diff)
downloadcgeo-dfa81310d0e5d6925d93bc089f7b526d7c344b11.zip
cgeo-dfa81310d0e5d6925d93bc089f7b526d7c344b11.tar.gz
cgeo-dfa81310d0e5d6925d93bc089f7b526d7c344b11.tar.bz2
Upgrade to RxJava 0.17.1 + cgeo patch
There is an ongoing problem with RxJava, discussed at https://github.com/Netflix/RxJava/issues/979 This version includes a patch available at https://github.com/cgeo/RxJava/commit/9ffb27f310d9f454d10d4d03206d8b5a262f6d63 fixup! Upgrade to RxJava 0.17.1
Diffstat (limited to 'main/src/cgeo/geocaching/MainActivity.java')
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index b83bef2..ab6256f 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -13,13 +13,13 @@ import cgeo.geocaching.geopoint.Units;
import cgeo.geocaching.list.PseudoList;
import cgeo.geocaching.list.StoredList;
import cgeo.geocaching.maps.CGeoMap;
+import cgeo.geocaching.sensors.GeoDirHandler;
import cgeo.geocaching.sensors.IGeoData;
import cgeo.geocaching.settings.Settings;
import cgeo.geocaching.settings.SettingsActivity;
import cgeo.geocaching.ui.Formatter;
import cgeo.geocaching.ui.dialog.Dialogs;
import cgeo.geocaching.utils.DatabaseBackupUtils;
-import cgeo.geocaching.sensors.GeoDirHandler;
import cgeo.geocaching.utils.Log;
import cgeo.geocaching.utils.Version;
@@ -30,8 +30,9 @@ import rx.Observable;
import rx.Observable.OnSubscribe;
import rx.Subscriber;
import rx.android.observables.AndroidObservable;
-import rx.schedulers.Schedulers;
import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.Subscriptions;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
@@ -52,7 +53,6 @@ import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import rx.subscriptions.Subscriptions;
import java.util.ArrayList;
import java.util.Arrays;
@@ -552,7 +552,7 @@ public class MainActivity extends AbstractActivity {
}
}
}).subscribeOn(Schedulers.io());
- AndroidObservable.fromActivity(MainActivity.this, address)
+ AndroidObservable.bindActivity(MainActivity.this, address)
.onErrorResumeNext(Observable.from(geo.getCoords().toString()))
.subscribe(new Action1<String>() {
@Override