diff --git a/oeffi/src/de/schildbach/oeffi/Constants.java b/oeffi/src/de/schildbach/oeffi/Constants.java index c6e97f0..b31a0fa 100644 --- a/oeffi/src/de/schildbach/oeffi/Constants.java +++ b/oeffi/src/de/schildbach/oeffi/Constants.java @@ -43,7 +43,8 @@ public class Constants { public static final long LOCATION_UPDATE_FREQ_MS = 10 * DateUtils.SECOND_IN_MILLIS; public static final int LOCATION_UPDATE_DISTANCE = 3; - public static final long LOCATION_TIMEOUT_MS = 2 * DateUtils.MINUTE_IN_MILLIS; + public static final long LOCATION_FOREGROUND_UPDATE_TIMEOUT_MS = 1 * DateUtils.MINUTE_IN_MILLIS; + public static final long LOCATION_BACKGROUND_UPDATE_TIMEOUT_MS = 5 * DateUtils.MINUTE_IN_MILLIS; public static final long STALE_UPDATE_MS = 2 * DateUtils.MINUTE_IN_MILLIS; public static final int MAX_NUMBER_OF_STOPS = 150; public static final int MAX_HISTORY_ENTRIES = 50; diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java index e219a22..323caeb 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java @@ -133,7 +133,7 @@ public class DirectionsShortcutActivity extends OeffiActivity final Criteria criteria = new Criteria(); criteria.setPowerRequirement(Criteria.POWER_MEDIUM); criteria.setAccuracy(Criteria.ACCURACY_COARSE); - locationHelper.startLocation(criteria, false, Constants.LOCATION_TIMEOUT_MS); + locationHelper.startLocation(criteria, false, Constants.LOCATION_FOREGROUND_UPDATE_TIMEOUT_MS); } public void stopLocation() { diff --git a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java index a601831..945a26b 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java +++ b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java @@ -280,7 +280,7 @@ public class LocationView extends FrameLayout implements LocationHelper.Callback final Criteria criteria = new Criteria(); criteria.setPowerRequirement(Criteria.POWER_MEDIUM); criteria.setAccuracy(Criteria.ACCURACY_COARSE); - locationHelper.startLocation(criteria, false, Constants.LOCATION_TIMEOUT_MS); + locationHelper.startLocation(criteria, false, Constants.LOCATION_FOREGROUND_UPDATE_TIMEOUT_MS); } } diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index 156597b..583a96b 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -246,7 +246,7 @@ public class NetworkPickerActivity extends Activity implements ActivityCompat.On final Criteria criteria = new Criteria(); criteria.setPowerRequirement(Criteria.POWER_LOW); - locationHelper.startLocation(criteria, true, Constants.LOCATION_TIMEOUT_MS); + locationHelper.startLocation(criteria, true, Constants.LOCATION_FOREGROUND_UPDATE_TIMEOUT_MS); } public void stopLocation() { diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index e7f6847..b6c26e3 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -203,7 +203,7 @@ public class PlansPickerActivity extends OeffiMainActivity implements ActivityCo final Criteria criteria = new Criteria(); criteria.setPowerRequirement(Criteria.POWER_LOW); - locationHelper.startLocation(criteria, true, Constants.LOCATION_TIMEOUT_MS); + locationHelper.startLocation(criteria, true, Constants.LOCATION_FOREGROUND_UPDATE_TIMEOUT_MS); } public void stopLocation() { diff --git a/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java b/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java index d5dec92..2d440ec 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java +++ b/oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java @@ -151,12 +151,12 @@ public class NearestFavoriteStationWidgetService extends JobIntentService { }, backgroundHandler.getLooper()); try { - final Location here = future.get(Constants.LOCATION_TIMEOUT_MS, TimeUnit.MILLISECONDS); + final Location here = future.get(Constants.LOCATION_BACKGROUND_UPDATE_TIMEOUT_MS, TimeUnit.MILLISECONDS); log.info("Widgets: {}, location: {}", Arrays.toString(appWidgetIds), here); handleLocation(appWidgetIds, here); } catch (final TimeoutException x) { log.info("Widgets: {}, location timed out after {} ms", Arrays.toString(appWidgetIds), - Constants.LOCATION_TIMEOUT_MS); + Constants.LOCATION_BACKGROUND_UPDATE_TIMEOUT_MS); widgetsHeader(appWidgetIds, getString(R.string.acquire_location_timeout)); } catch (final InterruptedException | ExecutionException x) { throw new RuntimeException(x);