From 492bff3e024d5475f7cd1da921800e5d531d87e9 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 26 Mar 2014 23:26:53 +0100 Subject: 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. --- main/src/cgeo/geocaching/maps/CGeoMap.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main/src/cgeo/geocaching/maps') 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) { -- cgit v1.1