aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/network/HtmlImage.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-05-29 12:39:18 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-06-01 10:46:34 +0200
commite4b5fb28b996383736fed065b94348645bde8d3d (patch)
treecfd832eea58cb10dc31fef1293a00326ac717402 /main/src/cgeo/geocaching/network/HtmlImage.java
parent1e914068d75298b46a6ccf2f6474eb5368edcb65 (diff)
downloadcgeo-e4b5fb28b996383736fed065b94348645bde8d3d.zip
cgeo-e4b5fb28b996383736fed065b94348645bde8d3d.tar.gz
cgeo-e4b5fb28b996383736fed065b94348645bde8d3d.tar.bz2
Add more parallelism in static maps downloads
Diffstat (limited to 'main/src/cgeo/geocaching/network/HtmlImage.java')
-rw-r--r--main/src/cgeo/geocaching/network/HtmlImage.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 167559d..7c3434e 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -92,7 +92,7 @@ public class HtmlImage implements Html.ImageGetter {
// Background loading
final private PublishSubject<Observable<String>> loading = PublishSubject.create();
- final Observable<String> waitForEnd = Observable.merge(loading).publish().refCount();
+ final private Observable<String> waitForEnd = Observable.merge(loading).publish().refCount();
final CompositeSubscription subscription = new CompositeSubscription(waitForEnd.subscribe());
final private Executor downloadExecutor = new ThreadPoolExecutor(10, 10, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@@ -223,12 +223,12 @@ public class HtmlImage implements Html.ImageGetter {
});
}
- public void waitForBackgroundLoading(@Nullable final CancellableHandler handler) {
+ public Observable<String> waitForEndObservable(@Nullable final CancellableHandler handler) {
if (handler != null) {
handler.unsubscribeIfCancelled(subscription);
}
loading.onCompleted();
- waitForEnd.toBlockingObservable().lastOrDefault(null);
+ return waitForEnd;
}
/**