From 2a86dcefc0abeec8130c0c94b167305611e0857a Mon Sep 17 00:00:00 2001
From: Petr Pokorny <petr-pokorny@hotmail.com>
Date: Wed, 28 Jul 2021 21:06:25 +0200
Subject: [PATCH] Fixing #117 (#130)

---
 .../main/java/com/mapbox/mapboxsdk/Mapbox.java    | 15 ++++++++-------
 .../activity/maplayout/SimpleMapActivity.java     | 11 ++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index 94bcb032b..ce009c265 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -59,14 +59,15 @@ public final class Mapbox {
       FileSource.initializeFileDirsPaths(appContext);
       INSTANCE = new Mapbox(appContext, null);
       ConnectivityReceiver.instance(appContext);
-    } else {
-      TileServerOptions tileServerOptions = TileServerOptions.get(WellKnownTileServer.MapLibre);
-      INSTANCE.tileServerOptions = tileServerOptions;
-      INSTANCE.apiKey = null;
-      FileSource fileSource = FileSource.getInstance(context);
-      fileSource.setTileServerOptions(tileServerOptions);
-      fileSource.setApiKey(null);
     }
+
+    TileServerOptions tileServerOptions = TileServerOptions.get(WellKnownTileServer.MapLibre);
+    INSTANCE.tileServerOptions = tileServerOptions;
+    INSTANCE.apiKey = null;
+    FileSource fileSource = FileSource.getInstance(context);
+    fileSource.setTileServerOptions(tileServerOptions);
+    fileSource.setApiKey(null);
+
     return INSTANCE;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
index abff0f595..2a0a052bf 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
@@ -9,6 +9,7 @@ import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.NavUtils;
+import com.mapbox.mapboxsdk.util.DefaultStyle;
 
 /**
  * Test activity showcasing a simple MapView without any MapboxMap interaction.
@@ -23,9 +24,13 @@ public class SimpleMapActivity extends AppCompatActivity {
     setContentView(R.layout.activity_map_simple);
     mapView = findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(mapboxMap -> mapboxMap.setStyle(
-      new Style.Builder().fromUri(Style.getPredefinedStyle("Streets"))
-    ));
+    mapView.getMapAsync(mapboxMap -> {
+      DefaultStyle[] styles = Style.getPredefinedStyles();
+      if (styles != null && styles.length > 0) {
+        String styleUrl = styles[0].getUrl();
+        mapboxMap.setStyle(new Style.Builder().fromUri(styleUrl));
+      }
+    });
   }
 
   @Override