prevent to use the map route until the map is ready and the route fet…

…ched and hide the launch navigation fab until a route is fetched to avoid null directions route npe (#1134)
mapbox · Jul 20, 2018 · 3a951eb · 3a951eb
1 parent de220ed
commit 3a951eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.../services/android/navigation/testapp/activity/navigationui/DualNavigationMapActivity.java b/.../services/android/navigation/testapp/activity/navigationui/DualNavigationMapActivity.java
@@ -89,7 +89,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
   @Override
   public void onNavigationReady(boolean isRunning) {
     isNavigationRunning = isRunning;
-    fetchRoute();
   }
 
   @Override
@@ -99,6 +98,7 @@ public void onMapReady(MapboxMap mapboxMap) {
     initLocationEngine();
     initLocationLayer();
     initMapRoute();
+    fetchRoute();
   }
 
   @Override
@@ -115,7 +115,6 @@ public void onMapLongClick(@NonNull LatLng point) {
   public void onResponse(Call<DirectionsResponse> call, Response<DirectionsResponse> response) {
     if (validRouteResponse(response)) {
       updateLoadingTo(false);
-      launchNavigationFab.setVisibility(View.VISIBLE);
       launchNavigationFab.show();
       route = response.body().routes().get(0);
       mapRoute.addRoutes(response.body().routes());

diff --git a/app/src/main/res/layout/activity_dual_navigation_map.xml b/app/src/main/res/layout/activity_dual_navigation_map.xml
@@ -45,7 +45,7 @@
         android:layout_marginRight="16dp"
         android:src="@drawable/ic_navigation"
         android:tint="@android:color/white"
-        android:visibility="visible"
+        android:visibility="invisible"
         app:backgroundTint="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>

diff --git a/app/src/main/res/layout/activity_dual_navigation_map_expanded.xml b/app/src/main/res/layout/activity_dual_navigation_map_expanded.xml
@@ -46,7 +46,7 @@
         android:layout_marginRight="16dp"
         android:src="@drawable/ic_navigation"
         android:tint="@android:color/white"
-        android:visibility="visible"
+        android:visibility="gone"
         app:backgroundTint="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>