mapbox · zugaldia · May 6, 2016 · May 6, 2016 · May 6, 2016 · May 6, 2016
diff --git a/libandroid/CHANGELOG.md b/libandroid/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+### v1.1.0
+
+* Updated to `libjava` v1.1.0
+* Removed extra dependencies to reduce method count
+
+Full changelog: https://github.com/mapbox/mapbox-java/issues?q=milestone%3Av1.1.0+is%3Aclosed
+
 ### v1.0.0
 
 * Initial release

diff --git a/libandroid/app/src/main/AndroidManifest.xml b/libandroid/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".directions.DirectionsV5Activity"
-            android:label="Directions v5 (experimental)"
+            android:label="Directions v5"
             android:parentActivityName=".MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity

diff --git a/libandroid/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java b/libandroid/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java
@@ -43,8 +43,8 @@ public class MainActivity extends AppCompatActivity {
     private RecyclerView.LayoutManager mLayoutManager;
 
     private final static List<SampleItem> samples = new ArrayList<>(Arrays.asList(
+            new SampleItem("Directions v5", "", DirectionsV5Activity.class),
             new SampleItem("Directions v4", "", DirectionsV4Activity.class),
-            new SampleItem("Directions v5 (experimental)", "", DirectionsV5Activity.class),
             new SampleItem("Directions icons", "", DirectionsIconsActivity.class),
             new SampleItem("Reverse geocoding", "", GeocodingReverseActivity.class),
             new SampleItem("Geocoding widget", "", GeocodingWidgetActivity.class),

diff --git a/...pp/src/main/java/com/mapbox/services/android/testapp/staticimage/StaticImageActivity.java b/...pp/src/main/java/com/mapbox/services/android/testapp/staticimage/StaticImageActivity.java
@@ -6,10 +6,12 @@
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 
 import com.mapbox.services.Constants;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.android.testapp.Utils;
+import com.mapbox.services.commons.ServicesException;
 import com.mapbox.services.staticimage.v1.MapboxStaticImage;
 
 public class StaticImageActivity extends AppCompatActivity {
@@ -76,25 +78,35 @@ private String[] buildDataset() {
         int i = 0;
         for (double[] place: PLACES) {
             for (String style: MAPBOX_STYLES) {
-                MapboxStaticImage staticImage = new MapboxStaticImage.Builder()
-                        .setAccessToken(Utils.getMapboxAccessToken(this))
-                        .setUsername(Constants.MAPBOX_USER)
-                        .setStyleId(style)
-                        .setLon(place[1])
-                        .setLat(place[0])
-                        .setZoom(16)
-                        .setBearing(45)
-                        .setPitch(60)
-                        .setWidth(500)
-                        .setHeight(500)
-                        .setRetina(isRetina)
-                        .build();
-                dataset[i] = staticImage.getUrl().toString();
-                i++;
+                String imageUrl = null;
+                try {
+                    imageUrl = getImageUrl(style, place, isRetina);
+                    dataset[i] = imageUrl;
+                    i++;
+                } catch (ServicesException e) {
+                    Log.e(LOG_TAG, "Error: " + e.getMessage());
+                    e.printStackTrace();
+                }
             }
         }
 
         return dataset;
     }
 
+    private String getImageUrl(String style, double[] place, boolean isRetina) throws ServicesException {
+        MapboxStaticImage staticImage = new MapboxStaticImage.Builder()
+                .setAccessToken(Utils.getMapboxAccessToken(this))
+                .setUsername(Constants.MAPBOX_USER)
+                .setStyleId(style)
+                .setLon(place[1])
+                .setLat(place[0])
+                .setZoom(16)
+                .setBearing(45)
+                .setPitch(60)
+                .setWidth(500)
+                .setHeight(500)
+                .setRetina(isRetina)
+                .build();
+        return staticImage.getUrl().toString();
+    }
 }
diff --git a/libandroid/lib/build.gradle b/libandroid/lib/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     compile 'com.android.support:design:23.3.0'
 
     // Mapbox Java Services
-    compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.0.0@jar') {
+    compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.1.0@jar') {
         transitive=true
     }
 

diff --git a/libandroid/lib/gradle.properties b/libandroid/lib/gradle.properties
@@ -1,5 +1,5 @@
 # Version name should be updated in build.gradle too.
-VERSION_NAME=1.1.0-SNAPSHOT
+VERSION_NAME=1.2.0-SNAPSHOT
 
 GROUP=com.mapbox.mapboxsdk
 

diff --git a/libandroid/lib/src/main/java/com/mapbox/services/android/geocoder/ui/GeocoderAdapter.java b/libandroid/lib/src/main/java/com/mapbox/services/android/geocoder/ui/GeocoderAdapter.java
@@ -10,13 +10,12 @@
 import android.widget.TextView;
 
 import com.mapbox.services.commons.ServicesException;
+import com.mapbox.services.commons.utils.TextUtils;
 import com.mapbox.services.geocoding.v5.MapboxGeocoding;
 import com.mapbox.services.geocoding.v5.models.GeocodingFeature;
 import com.mapbox.services.geocoding.v5.models.GeocodingResponse;
 import com.mapbox.services.commons.models.Position;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.IOException;
 import java.util.List;
 
@@ -141,7 +140,7 @@ protected FilterResults performFiltering(CharSequence constraint) {
             FilterResults results = new FilterResults();
 
             // No constraint
-            if (StringUtils.isEmpty(constraint)) {
+            if (TextUtils.isEmpty(constraint)) {
                 return results;
             }
 

diff --git a/libjava/CHANGELOG.md b/libjava/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+### v1.1.0
+
+* Support for directions API v5
+* Support for Maki 3 and directions icons in Test App
+* Fixed a bug where locale was different from `Locale.US`
+
+Full changelog: https://github.com/mapbox/mapbox-java/issues?q=milestone%3Av1.1.0+is%3Aclosed
+
 ### v1.0.0
 
 * Initial release: Java module with no Android dependencies

diff --git a/libjava/lib/gradle.properties b/libjava/lib/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.1.0-SNAPSHOT
+VERSION_NAME=1.2.0-SNAPSHOT
 GROUP=com.mapbox.mapboxsdk
 
 POM_DESCRIPTION=Mapbox Java Services

diff --git a/...va/lib/src/main/java/com/mapbox/services/commons/geojson/custom/GeometryDeserializer.java b/...va/lib/src/main/java/com/mapbox/services/commons/geojson/custom/GeometryDeserializer.java
@@ -10,8 +10,7 @@
 
 /**
  * Required to handle the "Unable to invoke no-args constructor for interface {@link Geometry} error
- * that Gson shows when trying to deserialize a List<Geometry>. There must be a better way to handle
- * this case.
+ * that Gson shows when trying to deserialize a list of {@link Geometry}.
  */
 public class GeometryDeserializer implements JsonDeserializer<Geometry> {