diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-03-22 10:48:16 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-03-22 14:26:11 +0100 |
| commit | dfa81310d0e5d6925d93bc089f7b526d7c344b11 (patch) | |
| tree | 1000fe164d1a9ff9bc5471c82f99197c22dc15c0 /main/src/cgeo/geocaching/settings | |
| parent | f0315a36dee4ef1992cea308868b6c221462dd68 (diff) | |
| download | cgeo-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/settings')
| -rw-r--r-- | main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java index 0b3f4ac..8a9d1c7 100644 --- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java +++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java @@ -65,7 +65,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab loginDialog.setCancelable(false); Cookies.clearCookies(); - AndroidObservable.fromActivity(activity, Async.start(new Func0<ImmutablePair<StatusCode, Drawable>>() { + AndroidObservable.bindActivity(activity, Async.start(new Func0<ImmutablePair<StatusCode, Drawable>>() { @Override public ImmutablePair<StatusCode, Drawable> call() { return login(); diff --git a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java index a1ab215..49239bc 100644 --- a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java +++ b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java @@ -53,7 +53,7 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference { activity.getString(R.string.init_sendToCgeo_registering), true); progressDialog.setCancelable(false); - AndroidObservable.fromActivity(activity, + AndroidObservable.bindActivity(activity, Observable.defer(new Func0<Observable<Integer>>() { @Override public Observable<Integer> call() { |