aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/settings
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2015-01-07 09:55:19 +0100
committerSamuel Tardieu <sam@rfc1149.net>2015-01-07 10:14:33 +0100
commit61385d66a8b5b0d16febc6f0642aea54d808628a (patch)
tree1fe18045cb9ad56946ba1fa72f9625b044ab33eb /main/src/cgeo/geocaching/settings
parent3085cb1bf05fc617a3225edd142b31d48314bff5 (diff)
downloadcgeo-61385d66a8b5b0d16febc6f0642aea54d808628a.zip
cgeo-61385d66a8b5b0d16febc6f0642aea54d808628a.tar.gz
cgeo-61385d66a8b5b0d16febc6f0642aea54d808628a.tar.bz2
Upgrade to RxAndroid 0.24.0
Diffstat (limited to 'main/src/cgeo/geocaching/settings')
-rw-r--r--main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java4
-rw-r--r--main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
index 2f83028..ed09757 100644
--- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
+++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
@@ -11,7 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import rx.Observable;
-import rx.android.observables.AndroidObservable;
+import rx.android.app.AppObservable;
import rx.functions.Action1;
import rx.functions.Func0;
import rx.util.async.Async;
@@ -74,7 +74,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
loginDialog.setCancelable(false);
Cookies.clearCookies();
- AndroidObservable.bindActivity(settingsActivity, Async.start(new Func0<ImmutablePair<StatusCode, Observable<Drawable>>>() {
+ AppObservable.bindActivity(settingsActivity, Async.start(new Func0<ImmutablePair<StatusCode, Observable<Drawable>>>() {
@Override
public ImmutablePair<StatusCode, Observable<Drawable>> call() {
return login();
diff --git a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
index 1e8e00a..e016921 100644
--- a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
+++ b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
@@ -13,7 +13,7 @@ import ch.boye.httpclientandroidlib.HttpResponse;
import org.apache.commons.lang3.StringUtils;
import rx.Observable;
-import rx.android.observables.AndroidObservable;
+import rx.android.app.AppObservable;
import rx.functions.Action1;
import rx.functions.Func0;
@@ -55,7 +55,7 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference {
activity.getString(R.string.init_sendToCgeo_registering), true);
progressDialog.setCancelable(false);
- AndroidObservable.bindActivity(activity, Observable.defer(new Func0<Observable<Integer>>() {
+ AppObservable.bindActivity(activity, Observable.defer(new Func0<Observable<Integer>>() {
@Override
public Observable<Integer> call() {
final String nam = StringUtils.defaultString(deviceName);