From c82cc90da30485bdd0e9ce81ba9a7806b089c327 Mon Sep 17 00:00:00 2001
From: Tobrun Van Nuland <tobrun.van.nuland@gmail.com>
Date: Tue, 20 Dec 2016 14:41:28 +0100
Subject: [PATCH] [android] - update lost to 2.0.0, gradle cleanup

---
 .../android/MapboxGLAndroidSDK/build.gradle   |  4 +-
 .../mapboxsdk/location/LocationServices.java  | 39 ++++++++++++++-----
 .../MapboxGLAndroidSDKTestApp/build.gradle    | 27 ++++++-------
 3 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index b17fa91d048..b76889da5c0 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 ext {
-    supportLibVersion = '25.0.0'
+    supportLibVersion = '25.1.0'
 }
 
 dependencies {
@@ -9,7 +9,7 @@ dependencies {
     compile "com.android.support:support-v4:${supportLibVersion}"
     compile "com.android.support:design:${supportLibVersion}"
     compile 'com.squareup.okhttp3:okhttp:3.5.0'
-    compile 'com.mapzen.android:lost:1.1.1'
+    compile 'com.mapzen.android:lost:2.0.0'
     compile 'com.jakewharton.timber:timber:4.3.1'
 
     // Mapbox Android Services
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
index 666dcb565f4..a1ed5d5b007 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
@@ -17,6 +17,8 @@
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import static com.mapzen.android.lost.api.LocationServices.FusedLocationApi;
+
 /**
  * Manages locational updates. Contains methods to register and unregister location listeners.
  * <ul>
@@ -31,7 +33,8 @@
  * in the history stack.
  * </p>
  */
-public class LocationServices implements com.mapzen.android.lost.api.LocationListener {
+public class LocationServices implements LostApiClient.ConnectionCallbacks,
+  com.mapzen.android.lost.api.LocationListener {
 
   private static LocationServices instance;
 
@@ -50,7 +53,7 @@ private LocationServices(Context context) {
     super();
     this.context = context;
     // Setup location services
-    locationClient = new LostApiClient.Builder(context).build();
+    locationClient = new LostApiClient.Builder(context).addConnectionCallbacks(this).build();
     locationListeners = new CopyOnWriteArrayList<>();
   }
 
@@ -81,38 +84,46 @@ public void toggleGPS(boolean enableGPS) {
     // Disconnect
     if (locationClient.isConnected()) {
       // Disconnect first to ensure that the new requests are GPS
-      com.mapzen.android.lost.api.LocationServices.FusedLocationApi.removeLocationUpdates(this);
+      FusedLocationApi.removeLocationUpdates(locationClient, this);
       locationClient.disconnect();
     }
+    isGpsEnabled = enableGPS;
 
     // Setup Fresh
     locationClient.connect();
-    Location lastLocation = com.mapzen.android.lost.api.LocationServices.FusedLocationApi.getLastLocation();
+  }
+
+  @Override
+  public void onConnected() {
+    //noinspection MissingPermission
+    Location lastLocation = FusedLocationApi.getLastLocation(locationClient);
     if (lastLocation != null) {
       this.lastLocation = lastLocation;
     }
 
     LocationRequest locationRequest;
 
-    if (enableGPS) {
+    if (isGpsEnabled) {
       // LocationRequest Tuned for GPS
       locationRequest = LocationRequest.create()
         .setFastestInterval(1000)
         .setSmallestDisplacement(3.0f)
         .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-
-      com.mapzen.android.lost.api.LocationServices.FusedLocationApi.requestLocationUpdates(locationRequest, this);
+      //noinspection MissingPermission
+      FusedLocationApi.requestLocationUpdates(locationClient, locationRequest, this);
     } else {
       // LocationRequest Tuned for PASSIVE
       locationRequest = LocationRequest.create()
         .setFastestInterval(1000)
         .setSmallestDisplacement(3.0f)
         .setPriority(LocationRequest.PRIORITY_NO_POWER);
-
-      com.mapzen.android.lost.api.LocationServices.FusedLocationApi.requestLocationUpdates(locationRequest, this);
+      //noinspection MissingPermission
+      FusedLocationApi.requestLocationUpdates(locationClient, locationRequest, this);
     }
+  }
 
-    isGpsEnabled = enableGPS;
+  @Override
+  public void onConnectionSuspended() {
   }
 
   /**
@@ -190,4 +201,12 @@ public boolean areLocationPermissionsGranted() {
     }
     return true;
   }
+
+  @Override
+  public void onProviderDisabled(String provider) {
+  }
+
+  @Override
+  public void onProviderEnabled(String provider) {
+  }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index b4d5548ae5b..9899942b5fc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -1,7 +1,10 @@
 apply plugin: 'com.android.application'
 
 ext {
-    supportLibVersion = '25.0.1'
+    supportLibVersion = '25.1.0'
+    espressoVersion = '2.2.2'
+    testRunnerVersion = '0.5'
+    leakCanaryVersion = '1.5'
 }
 
 android {
@@ -14,7 +17,6 @@ android {
         targetSdkVersion 25
         versionCode 11
         versionName "5.0.0"
-
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -66,24 +68,19 @@ dependencies {
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
 
     // Leak Canary
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-
-    // Mapbox Android Services
-    compile('com.mapbox.mapboxsdk:mapbox-android-services:1.3.0@aar') {
-        transitive = true
-    }
+    debugCompile "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
+    releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
+    testCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
 
     // Testing dependencies
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.2.27'
-    androidTestCompile "com.android.support:support-annotations:${supportLibVersion}"
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.squareup.spoon:spoon-client:1.6.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
+    androidTestCompile "com.android.support:support-annotations:${supportLibVersion}"
+    androidTestCompile "com.android.support.test:runner:${testRunnerVersion}"
+    androidTestCompile "com.android.support.test:rules:${testRunnerVersion}"
+    androidTestCompile "com.android.support.test.espresso:espresso-core:${espressoVersion}"
+    androidTestCompile "com.android.support.test.espresso:espresso-intents:${espressoVersion}"
 }
 
 apply from: 'gradle-make.gradle'