From 8eaff9ce13b1a16bf347d27fde2d9ebfdd8665a4 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Fri, 7 Dec 2018 17:00:36 +0200
Subject: [android] - make style part of location component activation, add
 tests for non existing style and multiple style loading, revisit code
 comments

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java')

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 558ea56a0d..b4c977cf15 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -1061,7 +1061,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
 
   private class MapCallback implements OnDidFinishLoadingStyleListener,
     OnDidFinishRenderingFrameListener, OnDidFinishLoadingMapListener,
-    OnCameraIsChangingListener, OnCameraDidChangeListener {
+    OnCameraIsChangingListener, OnCameraDidChangeListener, OnDidFailLoadingMapListener {
 
     private final List<OnMapReadyCallback> onMapReadyCallbackList = new ArrayList<>();
 
@@ -1071,6 +1071,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
       addOnDidFinishLoadingMapListener(this);
       addOnCameraIsChangingListener(this);
       addOnCameraDidChangeListener(this);
+      addOnDidFailLoadingMapListener(this);
     }
 
     void initialised() {
@@ -1107,6 +1108,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
       removeOnDidFinishLoadingMapListener(this);
       removeOnCameraIsChangingListener(this);
       removeOnCameraDidChangeListener(this);
+      removeOnDidFailLoadingMapListener(this);
     }
 
     @Override
@@ -1116,6 +1118,13 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
       }
     }
 
+    @Override
+    public void onDidFailLoadingMap(String errorMessage) {
+      if (mapboxMap != null) {
+        mapboxMap.onFailLoadingStyle();
+      }
+    }
+
     @Override
     public void onDidFinishRenderingFrame(boolean fully) {
       if (mapboxMap != null) {
-- 
cgit v1.2.1