better

mapbox · Mar 23, 2020 · e7037a0 · e7037a0
1 parent 4a8b8d7
commit e7037a0
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...tion-core/src/main/java/com/mapbox/navigation/core/routerefresh/RouteRefreshController.kt b/...tion-core/src/main/java/com/mapbox/navigation/core/routerefresh/RouteRefreshController.kt
@@ -33,11 +33,11 @@ internal class RouteRefreshController(
     fun start(): Job {
         stop()
         return routerRefreshTimer.startTimer {
-            val route = tripSession.route?.supportsRefresh()
-            val legIndex = tripSession.getRouteProgress()?.currentLegProgress()?.legIndex() ?: 0
-            route?.let { routeSupportsRefresh ->
+            val route = tripSession.route?.takeIf { supportsRefresh(it) }
+            route?.let {
+                val legIndex = tripSession.getRouteProgress()?.currentLegProgress()?.legIndex() ?: 0
                 directionsSession.requestRouteRefresh(
-                    routeSupportsRefresh,
+                    route,
                     legIndex,
                     routeRefreshCallback)
             }
@@ -48,10 +48,10 @@ internal class RouteRefreshController(
         routerRefreshTimer.stopJobs()
     }
 
-    private fun DirectionsRoute?.supportsRefresh(): DirectionsRoute? {
-        val isTrafficProfile = this?.routeOptions()
+    private fun supportsRefresh(route: DirectionsRoute?): Boolean {
+        val isTrafficProfile = route?.routeOptions()
             ?.profile()?.equals(DirectionsCriteria.PROFILE_DRIVING_TRAFFIC)
-        return if (isTrafficProfile == true) this else null
+        return isTrafficProfile == true
     }
 
     private val routeRefreshCallback = object : RouteRefreshCallback {