Merge branch 'issue-4529' into release

2 files changed, 3 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/playservices/LocationProvider.java b/main/src/cgeo/geocaching/playservices/LocationProvider.java
index 7bf7850..0450152 100644
--- a/main/src/cgeo/geocaching/playservices/LocationProvider.java
+++ b/main/src/cgeo/geocaching/playservices/LocationProvider.java
@@ -94,7 +94,7 @@ public class LocationProvider implements ConnectionCallbacks, OnConnectionFailed
     }
 
     public static Observable<GeoData> getMostPrecise(final Context context) {
-        return get(context, mostPreciseCount);
+        return get(context, mostPreciseCount).onBackpressureDrop();
     }
 
     public static Observable<GeoData> getLowPower(final Context context) {
@@ -118,7 +118,7 @@ public class LocationProvider implements ConnectionCallbacks, OnConnectionFailed
         // After sending the last known location, try to get a precise location then use the low-power mode. If no
         // location information is given for 25 seconds (if the network location is turned off for example), get
         // back to the precise location and try again.
-        return subject.first().concatWith(untilPreciseEnoughObservable.concatWith(lowPowerObservable).timeout(25, TimeUnit.SECONDS).retry());
+        return subject.first().concatWith(untilPreciseEnoughObservable.concatWith(lowPowerObservable).timeout(25, TimeUnit.SECONDS).retry()).onBackpressureDrop();
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/sensors/GeoDataProvider.java b/main/src/cgeo/geocaching/sensors/GeoDataProvider.java
index b3680fb..dab05d0 100644
--- a/main/src/cgeo/geocaching/sensors/GeoDataProvider.java
+++ b/main/src/cgeo/geocaching/sensors/GeoDataProvider.java
@@ -38,7 +38,7 @@ public class GeoDataProvider extends LooperCallbacks<GeoData> {
     }
 
     public static Observable<GeoData> create(final Context context) {
-        return Observable.create(new GeoDataProvider(context));
+        return Observable.create(new GeoDataProvider(context)).onBackpressureDrop();
     }
 
     @Override