From e33d71b55fc2ca3f2f83d5a17d88b64efb799608 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Wed, 26 Apr 2017 16:03:56 +0200
Subject: [android] - share locationsource between locational components
 (#8825)

---
 .../MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java | 4 +++-
 .../src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'platform/android/MapboxGLAndroidSDK/src/main/java')

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 83e2be3a69..8098ee4d86 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
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.support.annotation.NonNull;
+import android.support.annotation.UiThread;
 import android.text.TextUtils;
 
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
@@ -31,11 +32,12 @@ public final class Mapbox {
    * @param accessToken Mapbox access token
    * @return the single instance of Mapbox
    */
+  @UiThread
   public static synchronized Mapbox getInstance(@NonNull Context context, @NonNull String accessToken) {
     if (INSTANCE == null) {
       Context appContext = context.getApplicationContext();
       INSTANCE = new Mapbox(appContext, accessToken);
-      LocationEngine locationEngine = new LocationSource(appContext);
+      LocationEngine locationEngine = LocationSource.getLocationEngine(appContext);
       locationEngine.setPriority(LocationEnginePriority.NO_POWER);
       MapboxTelemetry.getInstance().initialize(
         appContext, accessToken, BuildConfig.MAPBOX_EVENTS_USER_AGENT, locationEngine);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
index dd6e43d06a..b795cf1d5b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
@@ -40,7 +40,7 @@ public class LocationSource extends LocationEngine implements
   private WeakReference<Context> context;
   private LostApiClient lostApiClient;
 
-  public LocationSource(Context context) {
+  private LocationSource(Context context) {
     super();
     this.context = new WeakReference<>(context);
     lostApiClient = new LostApiClient.Builder(this.context.get())
-- 
cgit v1.2.1