diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-01-11 16:08:07 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-01-11 21:16:42 +0100 |
| commit | 91bd1f845d4b803c33c6e05df021def81726d8d3 (patch) | |
| tree | 042c2ded5efd65458878fd74095aa1dd811fc659 | |
| parent | 9c61ebc535fc7ef35a336db15a80215f3535983f (diff) | |
| download | cgeo-91bd1f845d4b803c33c6e05df021def81726d8d3.zip cgeo-91bd1f845d4b803c33c6e05df021def81726d8d3.tar.gz cgeo-91bd1f845d4b803c33c6e05df021def81726d8d3.tar.bz2 | |
refactoring: use Observable.from() instead of Observable.just()
| -rw-r--r-- | main/src/cgeo/geocaching/MainActivity.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/network/StatusUpdater.java | 2 |
2 files changed, 2 insertions, 2 deletions
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<String>() { @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.<Status>empty(); + return response != null ? Observable.from(Status.defaultStatus((new Status(response)))) : Observable.<Status>empty(); } }).subscribeOn(Schedulers.threadPoolForIO()); |