aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/Geocache.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/Geocache.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/Geocache.java')
-rw-r--r--main/src/cgeo/geocaching/Geocache.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 2e6f566..193930c 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -33,6 +33,7 @@ import cgeo.geocaching.utils.Log;
import cgeo.geocaching.utils.LogTemplateProvider;
import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
import cgeo.geocaching.utils.MatcherWrapper;
+import cgeo.geocaching.utils.RxUtils;
import cgeo.geocaching.utils.UncertainProperty;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -1607,9 +1608,7 @@ public class Geocache implements ICache, IWaypoint {
return;
}
- StaticMapsProvider.downloadMaps(cache);
-
- imgGetter.waitForBackgroundLoading(handler);
+ RxUtils.waitForCompletion(StaticMapsProvider.downloadMaps(cache), imgGetter.waitForEndObservable(handler));
if (handler != null) {
handler.sendMessage(Message.obtain());