diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-03-31 15:06:25 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-03-31 15:06:25 +0200 |
| commit | 46675dfdcb4c7b511b4c35e4a2242e47d4678fd4 (patch) | |
| tree | 4dbec27998729b792d90ac6b0ee49648f77ccf3a /main/src/cgeo/geocaching/SearchResult.java | |
| parent | 4f8a1c6aeef324547ddd9e48ed726b57bfe8cf51 (diff) | |
| download | cgeo-46675dfdcb4c7b511b4c35e4a2242e47d4678fd4.zip cgeo-46675dfdcb4c7b511b4c35e4a2242e47d4678fd4.tar.gz cgeo-46675dfdcb4c7b511b4c35e4a2242e47d4678fd4.tar.bz2 | |
fix #3707: missing method in Android < 2.3
Diffstat (limited to 'main/src/cgeo/geocaching/SearchResult.java')
| -rw-r--r-- | main/src/cgeo/geocaching/SearchResult.java | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java index 12a2522..a673785 100644 --- a/main/src/cgeo/geocaching/SearchResult.java +++ b/main/src/cgeo/geocaching/SearchResult.java @@ -1,5 +1,6 @@ package cgeo.geocaching; +import android.os.Build; import cgeo.geocaching.connector.IConnector; import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.enumerations.CacheType; @@ -303,23 +304,35 @@ public class SearchResult implements Parcelable { public static <C extends IConnector> SearchResult parallelCombineActive(final Collection<C> connectors, final Func1<C, SearchResult> func) { - return Observable.from(connectors).parallel(new Func1<Observable<C>, Observable<SearchResult>>() { - @Override - public Observable<SearchResult> call(final Observable<C> cObservable) { - return cObservable.flatMap(new Func1<C, Observable<? extends SearchResult>>() { - @Override - public Observable<? extends SearchResult> call(final C c) { - return c.isActive() ? Observable.from(func.call(c)) : Observable.<SearchResult>empty(); - } - }); - } - }, Schedulers.io()).reduce(new SearchResult(), new Func2<SearchResult, SearchResult, SearchResult>() { - @Override - public SearchResult call(final SearchResult searchResult, final SearchResult searchResult2) { - searchResult.addSearchResult(searchResult2); - return searchResult; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) { + return Observable.from(connectors).parallel(new Func1<Observable<C>, Observable<SearchResult>>() { + @Override + public Observable<SearchResult> call(final Observable<C> cObservable) { + return cObservable.flatMap(new Func1<C, Observable<? extends SearchResult>>() { + @Override + public Observable<? extends SearchResult> call(final C c) { + return c.isActive() ? Observable.from(func.call(c)) : Observable.<SearchResult>empty(); + } + }); + } + }, Schedulers.io()).reduce(new SearchResult(), new Func2<SearchResult, SearchResult, SearchResult>() { + @Override + public SearchResult call(final SearchResult searchResult, final SearchResult searchResult2) { + searchResult.addSearchResult(searchResult2); + return searchResult; + } + }).toBlockingObservable().first(); + } else { + // Use a slower, sequential version for Android < 2.3, where parallel() does not work correctly + // because of missing Java method (here, Dequeue#offerLast). + final SearchResult result = new SearchResult(); + for (final C connector : connectors) { + if (connector.isActive()) { + result.addSearchResult(func.call(connector)); + } } - }).toBlockingObservable().first(); + return result; + } } } |
