use function

Author: kmadsen

libnavui-androidauto/api/current.txt

@@ -204,14 +204,13 @@ package com.mapbox.androidauto.car.feedback.ui {
 package com.mapbox.androidauto.car.location {
 
   public final class CarLocationProvider implements com.mapbox.maps.plugin.locationcomponent.LocationProvider com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {
-    method public android.location.Location? getLastLocation();
     method public static com.mapbox.androidauto.car.location.CarLocationProvider getRegisteredInstance();
+    method public android.location.Location? lastLocation();
     method public void onAttached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
     method public void onDetached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
     method public void registerLocationConsumer(com.mapbox.maps.plugin.locationcomponent.LocationConsumer locationConsumer);
     method public void unRegisterLocationConsumer(com.mapbox.maps.plugin.locationcomponent.LocationConsumer locationConsumer);
     method public suspend Object? validLocation(kotlin.coroutines.Continuation<? super android.location.Location>);
-    property public final android.location.Location? lastLocation;
     field public static final com.mapbox.androidauto.car.location.CarLocationProvider.Companion Companion;
   }
 

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/location/CarLocationProvider.kt

@@ -58,8 +58,7 @@ class CarLocationProvider private constructor() : MapboxNavigationObserver, Loca
     /**
      * Immediately access the last location received.
      */
-    val lastLocation: Location?
-        get() = navigationLocationProvider.lastLocation
+    fun lastLocation(): Location? = navigationLocationProvider.lastLocation
 
     /**
      * Wait until a non-null location is received. Improves results when the app is starting.

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListOnMapManager.kt

@@ -52,7 +52,7 @@ class PlacesListOnMapManager(
     }
 
     fun currentItemList(): ItemList? {
-        val currentLocation = CarLocationProvider.getRegisteredInstance().lastLocation
+        val currentLocation = CarLocationProvider.getRegisteredInstance().lastLocation()
             ?: return null
         return placesListItemMapper?.mapToItemList(
             currentLocation,

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/preview/CarRoutePreviewRequest.kt

@@ -65,7 +65,7 @@ class CarRoutePreviewRequest internal constructor(
         }
         cancelRequest()
 
-        val location = CarLocationProvider.getRegisteredInstance().lastLocation
+        val location = CarLocationProvider.getRegisteredInstance().lastLocation()
         if (location == null) {
             logAndroidAutoFailure("CarRoutePreview.onUnknownCurrentLocation")
             callback.onUnknownCurrentLocation()

libnavui-androidauto/src/test/java/com/mapbox/androidauto/car/preview/CarRoutePreviewRequestTest.kt

@@ -70,7 +70,7 @@ class CarRoutePreviewRequestTest {
     @Test
     fun `onRoutesReady is called after successful request`() {
         every {
-            locationProvider.lastLocation
+            locationProvider.lastLocation()
         } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
@@ -91,7 +91,7 @@ class CarRoutePreviewRequestTest {
 
     @Test
     fun `onUnknownCurrentLocation is called when current location is null`() {
-        every { locationProvider.lastLocation } returns null
+        every { locationProvider.lastLocation() } returns null
         val callback: CarRoutePreviewRequestCallback = mockk(relaxUnitFun = true)
         val searchCoordinate = Point.fromLngLat(-121.467001, 38.568105)
         carRouteRequest.onAttached(mapboxNavigation)
@@ -106,7 +106,7 @@ class CarRoutePreviewRequestTest {
     @Test
     fun `onSearchResultLocationUnknown is called when search result coordinate is`() {
         every {
-            locationProvider.lastLocation
+            locationProvider.lastLocation()
         } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
@@ -124,7 +124,7 @@ class CarRoutePreviewRequestTest {
     @Test
     fun `onNoRoutesFound is called when route request is canceled`() {
         every {
-            locationProvider.lastLocation
+            locationProvider.lastLocation()
         } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
@@ -145,7 +145,7 @@ class CarRoutePreviewRequestTest {
     @Test
     fun `onNoRoutesFound is called when route request fails`() {
         every {
-            locationProvider.lastLocation
+            locationProvider.lastLocation()
         } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
@@ -166,7 +166,7 @@ class CarRoutePreviewRequestTest {
     @Test
     fun `onNoRoutesFound is called when mapboxNavigation is not attached`() {
         every {
-            locationProvider.lastLocation
+            locationProvider.lastLocation()
         } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
@@ -185,7 +185,7 @@ class CarRoutePreviewRequestTest {
     @Test
     fun `should cancel previous route request`() {
         every {
-            locationProvider.lastLocation
+            locationProvider.lastLocation()
         } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
@@ -207,7 +207,7 @@ class CarRoutePreviewRequestTest {
 
     @Test
     fun `z level is passed to route options`() {
-        every { locationProvider.lastLocation } returns mockk {
+        every { locationProvider.lastLocation() } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
         }
@@ -226,7 +226,7 @@ class CarRoutePreviewRequestTest {
             every { build() } returns customRouteOptions
         }
         every { options.routeOptionsInterceptor.intercept(any()) } returns customRouteOptionsBuilder
-        every { locationProvider.lastLocation } returns mockk {
+        every { locationProvider.lastLocation() } returns mockk {
             every { longitude } returns -121.4670161
             every { latitude } returns 38.5630514
         }