aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/maps
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-03-26 23:26:53 +0100
committerSamuel Tardieu <sam@rfc1149.net>2014-03-26 23:29:01 +0100
commit492bff3e024d5475f7cd1da921800e5d531d87e9 (patch)
treeb23d024a08c3659b9439bb6b0f2e6c6931a8bf68 /main/src/cgeo/geocaching/maps
parent4b693e9beb39d2043b76e6eeb09e91e4059ef7aa (diff)
downloadcgeo-492bff3e024d5475f7cd1da921800e5d531d87e9.zip
cgeo-492bff3e024d5475f7cd1da921800e5d531d87e9.tar.gz
cgeo-492bff3e024d5475f7cd1da921800e5d531d87e9.tar.bz2
Allow subscription to either location or direction data
The forced union of both information is not appropriate in several activities where only GPS data is needed, or where direction data update less components than location data (such as cache lists). This is part of work on #3680.
Diffstat (limited to 'main/src/cgeo/geocaching/maps')
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 61b321d..962f5e5 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -44,6 +44,9 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import rx.Scheduler;
import rx.Subscription;
import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+import rx.subscriptions.Subscriptions;
import android.app.Activity;
import android.app.AlertDialog;
@@ -69,9 +72,6 @@ import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.TextView;
import android.widget.ViewSwitcher.ViewFactory;
-import rx.schedulers.Schedulers;
-import rx.subscriptions.CompositeSubscription;
-import rx.subscriptions.Subscriptions;
import java.io.File;
import java.util.ArrayList;
@@ -495,7 +495,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
@Override
public void onResume() {
super.onResume();
- resumeSubscription = Subscriptions.from(geoDirUpdate.start(), startTimer());
+ resumeSubscription = Subscriptions.from(geoDirUpdate.start(GeoDirHandler.UPDATE_GEODIR), startTimer());
if (!CollectionUtils.isEmpty(dirtyCaches)) {
for (String geocode : dirtyCaches) {