From 91bd1f845d4b803c33c6e05df021def81726d8d3 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 11 Jan 2014 16:08:07 +0100 Subject: refactoring: use Observable.from() instead of Observable.just() --- main/src/cgeo/geocaching/MainActivity.java | 2 +- main/src/cgeo/geocaching/network/StatusUpdater.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index cb94183..a4a76d9 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -556,7 +556,7 @@ public class MainActivity extends AbstractActivity { } }).subscribeOn(Schedulers.threadPoolForIO()); AndroidObservable.fromActivity(MainActivity.this, address) - .onErrorResumeNext(Observable.just(geo.getCoords().toString())) + .onErrorResumeNext(Observable.from(geo.getCoords().toString())) .subscribe(new Action1() { @Override public void call(final String address) { diff --git a/main/src/cgeo/geocaching/network/StatusUpdater.java b/main/src/cgeo/geocaching/network/StatusUpdater.java index ae8ce8b..2d565bf 100644 --- a/main/src/cgeo/geocaching/network/StatusUpdater.java +++ b/main/src/cgeo/geocaching/network/StatusUpdater.java @@ -58,7 +58,7 @@ public class StatusUpdater { new Parameters("version_code", String.valueOf(Version.getVersionCode(CgeoApplication.getInstance())), "version_name", Version.getVersionName(CgeoApplication.getInstance()), "locale", Locale.getDefault().toString())); - return response != null ? Observable.just(Status.defaultStatus((new Status(response)))) : Observable.empty(); + return response != null ? Observable.from(Status.defaultStatus((new Status(response)))) : Observable.empty(); } }).subscribeOn(Schedulers.threadPoolForIO()); -- cgit v1.1