aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/StaticMapsActivity.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/StaticMapsActivity.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/StaticMapsActivity.java')
-rw-r--r--main/src/cgeo/geocaching/StaticMapsActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index ca1f5ee..134e134 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
import cgeo.geocaching.activity.AbstractActionBarActivity;
import cgeo.geocaching.enumerations.LoadFlags;
import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.RxUtils;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.Extra;
@@ -152,7 +153,7 @@ public class StaticMapsActivity extends AbstractActionBarActivity {
final Geocache cache = DataStore.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
if (waypointId == null) {
showToast(res.getString(R.string.info_storing_static_maps));
- StaticMapsProvider.storeCacheStaticMap(cache, true);
+ RxUtils.waitForCompletion(StaticMapsProvider.storeCacheStaticMap(cache));
return cache.hasStaticMap();
}
final Waypoint waypoint = cache.getWaypointById(waypointId);
@@ -160,7 +161,7 @@ public class StaticMapsActivity extends AbstractActionBarActivity {
showToast(res.getString(R.string.info_storing_static_maps));
// refresh always removes old waypoint files
StaticMapsProvider.removeWpStaticMaps(waypoint, geocode);
- StaticMapsProvider.storeWaypointStaticMap(cache, waypoint, true);
+ RxUtils.waitForCompletion(StaticMapsProvider.storeWaypointStaticMap(cache, waypoint));
return StaticMapsProvider.hasStaticMapForWaypoint(geocode, waypoint);
}
showToast(res.getString(R.string.err_detail_not_load_map_static));